Date: Mon, 23 Jun 2003 18:17:15 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 33596 for review Message-ID: <200306240117.h5O1HFDj033033@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=33596 Change 33596 by marcel@marcel_nfs on 2003/06/23 18:16:47 IFC @33595 Affected files ... .. //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R#2 integrate .. //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 integrate .. //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 integrate .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R#3 delete .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R.base#3 delete .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R.check#2 delete .. //depot/projects/ia64/contrib/nvi/catalog/ru_SU.KOI8-R.owner#2 delete .. //depot/projects/ia64/games/grdc/grdc.c#3 integrate .. //depot/projects/ia64/include/Makefile#28 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#3 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/ksd.h#1 branch .. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#20 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#14 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#17 integrate .. //depot/projects/ia64/share/man/man4/Makefile#50 integrate .. //depot/projects/ia64/share/man/man4/ath.4#1 branch .. //depot/projects/ia64/share/man/man4/ath_hal.4#1 branch .. //depot/projects/ia64/share/man/man4/fatm.4#1 branch .. //depot/projects/ia64/share/man/man4/natm.4#4 integrate .. //depot/projects/ia64/share/man/man4/natmip.4#3 integrate .. //depot/projects/ia64/share/man/man7/ports.7#8 integrate .. //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#7 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#10 integrate .. //depot/projects/ia64/share/syscons/keymaps/lat-amer.kbd#2 delete .. //depot/projects/ia64/share/syscons/keymaps/latinamerican.iso.acc.kbd#1 branch .. //depot/projects/ia64/share/syscons/keymaps/latinamerican.kbd#1 branch .. //depot/projects/ia64/sys/conf/NOTES#54 integrate .. //depot/projects/ia64/sys/conf/files#83 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#14 integrate .. //depot/projects/ia64/sys/dev/ath/if_ath.c#1 branch .. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#1 branch .. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#1 branch .. //depot/projects/ia64/sys/dev/ath/if_athvar.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/firmware.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatm_rate.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatmreg.h#1 branch .. //depot/projects/ia64/sys/dev/fatm/if_fatmvar.h#1 branch .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#35 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#18 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#23 integrate .. //depot/projects/ia64/sys/modules/Makefile#54 integrate .. //depot/projects/ia64/sys/modules/ath/Makefile#1 branch .. //depot/projects/ia64/sys/modules/fatm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#12 integrate .. //depot/projects/ia64/sys/net80211/ieee80211.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_input.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_node.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_node.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_output.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#1 branch .. //depot/projects/ia64/sys/net80211/ieee80211_var.h#1 branch .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#18 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#12 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#31 integrate .. //depot/projects/ia64/usr.bin/fstat/fstat.c#14 integrate .. //depot/projects/ia64/usr.bin/soelim/Makefile#4 delete .. //depot/projects/ia64/usr.bin/soelim/soelim.1#4 delete .. //depot/projects/ia64/usr.bin/soelim/soelim.c#6 delete .. //depot/projects/ia64/usr.bin/vi/Makefile#9 integrate .. //depot/projects/ia64/usr.sbin/keyadmin/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/keyadmin/keyadmin.8#3 delete .. //depot/projects/ia64/usr.sbin/keyadmin/keyadmin.c#3 delete .. //depot/projects/ia64/usr.sbin/keyadmin/keys#2 delete .. //depot/projects/ia64/usr.sbin/ppp/Makefile#5 integrate Differences ... ==== //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R#2 (text+ko) ==== @@ -101,10 +101,10 @@ Недопустимая комбинация в адресеX Неправильный адрес: всего %lu строк в файлеX Неправильный адрес: файл пустX -Комманда %s не может использовать адрес 0X +Команда %s не может использовать адрес 0X Аббревиатуры отсутствуютX Аббревиатуры должны заканчиваться символом "word"X -Аббревиатуры не могут содержать символоы табляции или пробелыX +Аббревиатуры не могут содержать символы табуляции или пробелыX Аббревиатуры не могут сочетаться с символами слов/не-слов, за исключением конца строкиX "%s" не является аббревиатуройX @@ -120,7 +120,7 @@ Файл изменен с момента последней полной записи: используйте ! для обходаX Невозможно найти домашний каталогX Новый каталог: %sX -Нет вырезаных буферовX +Нет вырезанных буферовX Команда %s не может быть использована внутри глобальной или v командыX %s/%s: не открыт: не принадлежит Вам или root-уX %s/%s: не открыт: не принадлежит ВамX @@ -169,7 +169,7 @@ ПрерваноX Отсутствие буфера для использованияX -Нет предидущего регулярного выраженияX +Нет предыдущего регулярного выраженияX Команда %s подразумевает наличие прочтенного файлаX Использование: %sX Команда visual подразумевает обязательную установку опции openX ==== //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.base#2 (text+ko) ==== @@ -77,10 +77,10 @@ 101 "Недопустимая комбинация в адресе" 102 "Неправильный адрес: всего %lu строк в файле" 103 "Неправильный адрес: файл пуст" -104 "Комманда %s не может использовать адрес 0" +104 "Команда %s не может использовать адрес 0" 105 "Аббревиатуры отсутствуют" 106 "Аббревиатуры должны заканчиваться символом "word"" -107 "Аббревиатуры не могут содержать символоы табляции или пробелы" +107 "Аббревиатуры не могут содержать символы табуляции или пробелы" 108 "Аббревиатуры не могут сочетаться с символами слов/не-слов, за исключением конца строки" 109 ""%s" не является аббревиатурой" 111 "Файлов для редактирования больше нет" @@ -95,7 +95,7 @@ 120 "Файл изменен с момента последней полной записи: используйте ! для обхода" 121 "Невозможно найти домашний каталог" 122 "Новый каталог: %s" -123 "Нет вырезаных буферов" +123 "Нет вырезанных буферов" 124 "Команда %s не может быть использована внутри глобальной или v команды" 125 "%s/%s: не открыт: не принадлежит Вам или root-у" 126 "%s/%s: не открыт: не принадлежит Вам" @@ -138,7 +138,7 @@ 168 "Буфер %s пуст" 170 "Прервано" 171 "Отсутствие буфера для использования" -172 "Нет предидущего регулярного выражения" +172 "Нет предыдущего регулярного выражения" 173 "Команда %s подразумевает наличие прочтенного файла" 174 "Использование: %s" 175 "Команда visual подразумевает обязательную установку опции open" ==== //depot/projects/ia64/contrib/nvi/catalog/ru_RU.KOI8-R.owner#2 (text+ko) ==== @@ -1,1 +1,1 @@ -Dima Ruban <dima@rdy.com>, "Andrey A. Chernov" <ache@nagual.ru> +Dima Ruban <dima@rdy.com>, "Andrey A. Chernov" <ache@nagual.pp.ru> ==== //depot/projects/ia64/games/grdc/grdc.c#3 (text+ko) ==== @@ -11,7 +11,7 @@ * modified 03-25-03 for 12 hour option * - Samy Al Bahra <samy@kerneled.com> * - * $FreeBSD: src/games/grdc/grdc.c,v 1.10 2003/03/28 16:37:45 mux Exp $ + * $FreeBSD: src/games/grdc/grdc.c,v 1.12 2003/06/23 16:02:40 will Exp $ */ #include <err.h> @@ -149,8 +149,12 @@ if (tm->tm_hour > 12) { tm->tm_hour -= 12; mvaddstr(YBASE + 5, XBASE + 52, "PM"); - } else + } else { + if (tm->tm_hour == 0) + tm->tm_hour = 12; + mvaddstr(YBASE + 5, XBASE + 52, "AM"); + } } set(tm->tm_hour%10, 20); ==== //depot/projects/ia64/include/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.198 2003/06/12 14:28:31 harti Exp $ +# $FreeBSD: src/include/Makefile,v 1.199 2003/06/23 14:43:43 ru Exp $ # # Doing a "make install" builds /usr/include. @@ -104,8 +104,11 @@ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${DESTDIR}${INCLUDEDIR}/$i .endfor - cd ${.CURDIR}/../sys; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \ + cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/netinet + cd ${.CURDIR}/../sys/opencrypto; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/crypto cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ @@ -136,6 +139,11 @@ ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor + cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ + for h in *.h; do \ + ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \ + ${DESTDIR}${INCLUDEDIR}/netinet; \ + done cd ${.CURDIR}/../sys/opencrypto; \ for h in *.h; do \ ln -fs ../../../sys/opencrypto/$$h \ ==== //depot/projects/ia64/lib/libpthread/arch/i386/i386/ksd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.3 2003/05/19 23:04:49 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/ksd.c,v 1.4 2003/06/23 23:15:05 marcel Exp $"); #include <sys/types.h> #include <machine/cpufunc.h> @@ -39,6 +39,7 @@ #include <string.h> #include <ucontext.h> +#include "pthread_md.h" #include "ksd.h" #define LDT_ENTRIES 8192 ==== //depot/projects/ia64/lib/libpthread/arch/i386/include/ksd.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ /* - * $FreeBSD: src/lib/libpthread/arch/i386/include/ksd.h,v 1.3 2003/04/23 21:49:34 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/ksd.h,v 1.5 2003/06/23 23:15:06 marcel Exp $ */ #ifndef _KSD_H_ @@ -34,22 +34,9 @@ #include <sys/types.h> -struct pthread; -struct __ucontext; struct kse; /* - * KSE Specific Data. - */ -struct ksd { - int ldt; -#define KSDF_INITIALIZED 0x01 - long flags; - void *base; - long size; -}; - -/* * Evaluates to the byte offset of the per-kse variable name. */ #define __ksd_offset(name) __offsetof(struct kse, name) @@ -132,11 +119,11 @@ #define KSD_SET_PTR(member, val) __KSD_SET32(k_ ## member, val) #define KSD_READANDCLEAR_PTR(member) __KSD_READANDCLEAR32(k_ ## member) -#define _ksd_curkse ((struct kse *)KSD_GET_PTR(mbx.km_udata)) -#define _ksd_curthread KSD_GET_PTR(curthread) +#define _ksd_curkse() ((struct kse *)KSD_GET_PTR(mbx.km_udata)) +#define _ksd_curthread() KSD_GET_PTR(curthread) #define _ksd_set_tmbx(value) KSD_SET_PTR(mbx.km_curthread, (void *)value) -#define _ksd_get_tmbx(value) KSD_GET_PTR(mbx.km_curthread) -#define _ksd_readandclear_tmbx KSD_READANDCLEAR_PTR(mbx.km_curthread) +#define _ksd_get_tmbx() KSD_GET_PTR(mbx.km_curthread) +#define _ksd_readandclear_tmbx() KSD_READANDCLEAR_PTR(mbx.km_curthread) int _ksd_create(struct ksd *ksd, void *base, int size); void _ksd_destroy(struct ksd *ksd); ==== //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.3 2003/04/30 15:05:17 deischen Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.4 2003/06/23 23:15:06 marcel Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. @@ -51,4 +51,16 @@ #define THR_ALIGNBYTES 15 #define THR_ALIGN(td) (((unsigned)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES) + +/* + * KSE Specific Data. + */ +struct ksd { + int ldt; +#define KSDF_INITIALIZED 0x01 + long flags; + void *base; + long size; +}; + #endif ==== //depot/projects/ia64/lib/libpthread/arch/ia64/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.1 2003/06/23 04:28:31 marcel Exp $ +# $FreeBSD: src/lib/libpthread/arch/ia64/Makefile.inc,v 1.2 2003/06/23 23:15:06 marcel Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= ksd.c thr_enter_uts.S thr_switch.S +SRCS+= thr_enter_uts.S thr_switch.S ==== //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.1 2003/06/23 04:52:09 marcel Exp $ + * $FreeBSD: src/lib/libpthread/arch/ia64/include/pthread_md.h,v 1.2 2003/06/23 23:15:06 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -35,4 +35,10 @@ #define THR_ALIGNBYTES 15 #define THR_ALIGN(td) (((uintptr_t)(td) + THR_ALIGNBYTES) & ~THR_ALIGNBYTES) +/* KSE Specific Data. */ +struct ksd { + void *ksd_base; + int ksd_size; +}; + #endif /* _PTHREAD_MD_H_ */ ==== //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#20 (text+ko) ==== @@ -33,7 +33,7 @@ * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.69 2003/06/08 17:35:11 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.71 2003/06/23 23:15:06 marcel Exp $"); #include <sys/types.h> #include <sys/kse.h> @@ -52,8 +52,8 @@ #include "atomic_ops.h" #include "thr_private.h" -#include "pthread_md.h" #include "libc_private.h" +#include "ksd.h" /*#define DEBUG_THREAD_KERN */ #ifdef DEBUG_THREAD_KERN @@ -478,7 +478,7 @@ { kse_critical_t crit; - crit = _ksd_readandclear_tmbx; + crit = _ksd_readandclear_tmbx(); return (crit); } @@ -1815,14 +1815,14 @@ struct pthread * _get_curthread(void) { - return (_ksd_curthread); + return (_ksd_curthread()); } /* This assumes the caller has disabled upcalls. */ struct kse * _get_curkse(void) { - return (_ksd_curkse); + return (_ksd_curkse()); } void ==== //depot/projects/ia64/lib/libpthread/thread/thr_private.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.89 2003/05/30 00:21:52 kan Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.90 2003/06/23 23:15:06 marcel Exp $ */ #ifndef _THR_PRIVATE_H @@ -54,7 +54,6 @@ #include <pthread.h> #include <pthread_np.h> -#include "ksd.h" #include "lock.h" #include "pthread_md.h" ==== //depot/projects/ia64/sbin/ipfw/ipfw2.c#17 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.27 2003/06/23 08:20:28 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.28 2003/06/23 22:32:14 luigi Exp $ */ #include <sys/param.h> @@ -1607,15 +1607,20 @@ if (*av == NULL) { warnx("missing keyword to enable/disable\n"); } else if (strncmp(*av, "firewall", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.enable", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.enable", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "one_pass", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.one_pass", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.one_pass", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "debug", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.debug", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.debug", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "verbose", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.verbose", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.verbose", NULL, 0, + &which, sizeof(which)); } else if (strncmp(*av, "dyn_keepalive", strlen(*av)) == 0) { - sysctlbyname("net.inet.ip.fw.dyn_keepalive", NULL, 0, &which, sizeof(which)); + sysctlbyname("net.inet.ip.fw.dyn_keepalive", NULL, 0, + &which, sizeof(which)); } else { warnx("unrecognize enable/disable keyword: %s\n", *av); } ==== //depot/projects/ia64/share/man/man4/Makefile#50 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.209 2003/06/17 16:14:31 harti Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.211 2003/06/23 20:54:39 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -19,6 +19,8 @@ atapicam.4 \ atkbd.4 \ atkbdc.4 \ + ath.4 \ + ath_hal.4 \ aue.4 \ awi.4 \ axe.4 \ @@ -53,6 +55,7 @@ exca.4 \ faith.4 \ fast_ipsec.4 \ + fatm.4 \ fd.4 \ fdc.4 \ firewire.4 \ @@ -291,6 +294,7 @@ MLINKS+=em.4 if_em.4 MLINKS+=en.4 if_en.4 MLINKS+=faith.4 if_faith.4 +MLINKS+=fatm.4 if_fatm.4 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4 MLINKS+=fpa.4 fea.4 MLINKS+=fwe.4 if_fwp.4 ==== //depot/projects/ia64/share/man/man4/natm.4#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/natm.4,v 1.12 2003/06/17 16:15:47 harti Exp $ +.\" $FreeBSD: src/share/man/man4/natm.4,v 1.13 2003/06/23 14:46:11 harti Exp $ .\" .Dd December 29, 1997 .Dt NATM 4 @@ -87,6 +87,7 @@ .Sh SEE ALSO .Xr en 4 , .Xr hatm 4 , +.Xr fatm 4 , .Xr natmip 4 .Sh AUTHORS .An Chuck Cranor ==== //depot/projects/ia64/share/man/man4/natmip.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.2 2003/06/17 16:15:47 harti Exp $ +.\" $FreeBSD: src/share/man/man4/natmip.4,v 1.3 2003/06/23 14:46:11 harti Exp $ .\" .Dd June 13, 2003 .Dt NATMIP 4 @@ -106,6 +106,7 @@ .Sh SEE ALSO .Xr en 4 , .Xr hatm 4 , +.Xr fatm 4 , .Xr natm 4 .Sh AUTHORS .An Chuck Cranor ==== //depot/projects/ia64/share/man/man7/ports.7#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/ports.7,v 1.36 2003/02/22 11:57:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.37 2003/06/23 20:01:58 ru Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -305,7 +305,7 @@ .Fx site for all files. .It Va MASTER_SITE_OVERRIDE -Try going to this site for all files and patches, first. +Try going to these sites for all files and patches, first. .It Va NOCLEANDEPENDS If defined, do not let .Cm clean ==== //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.49 2003/06/19 08:34:38 murray Exp $ +# $FreeBSD: src/share/syscons/keymaps/INDEX.keymaps,v 1.50 2003/06/23 21:01:57 ache Exp $ # # database for kbdmap(8) # @@ -211,9 +211,13 @@ jp.pc98.iso.kbd:en:Japanese PC-98x1 (ISO) -lat-amer.kbd:en:Latin American -lat-amer.kbd:de:Latein Amerikanisch -lat-amer.kbd:pt,es:AmИrica Latina +latinamerican.kbd:en:Latin American +latinamerican.kbd:de:Latein Amerikanisch +latinamerican.kbd:pt,es:AmИrica Latina + +latinamerican.iso.acc.kbd:en:Latin American (accent keys) +latinamerican.iso.acc.kbd:de:Latein Amerikanisch (mit Akzenten) +latinamerican.iso.acc.kbd:pt,es:AmИrica Latina (com acentos) lt.iso4.kbd:en:Lithuanian ISO-8859-4 lt.iso4.kbd:es:Lituano ISO-8859-4 ==== //depot/projects/ia64/share/syscons/keymaps/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.62 2003/06/19 08:34:38 murray Exp $ +# $FreeBSD: src/share/syscons/keymaps/Makefile,v 1.63 2003/06/23 21:01:57 ache Exp $ KEYMAPS= INDEX.keymaps KEYMAPS+= be.iso.kbd be.iso.acc.kbd @@ -21,7 +21,7 @@ KEYMAPS+= it.iso.kbd KEYMAPS+= iw.iso8.kbd KEYMAPS+= jp.106.kbd jp.106x.kbd jp.pc98.kbd jp.pc98.iso.kbd -KEYMAPS+= lat-amer.kbd +KEYMAPS+= latinamerican.kbd latinamerican.iso.acc.kbd KEYMAPS+= lt.iso4.kbd KEYMAPS+= norwegian.iso.kbd norwegian.dvorak.kbd KEYMAPS+= pl_PL.ISO8859-2.kbd ==== //depot/projects/ia64/sys/conf/NOTES#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1153 2003/06/18 09:29:27 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1154 2003/06/23 14:46:11 harti Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1677,13 +1677,15 @@ # The `hatm' device provides support for Fore/Marconi HE155 and HE622 # ATM PCI cards. # +# The `fatm' device provides support for Fore PCA200E ATM PCI cards. +# # atm device provides generic atm functions and is required for # atm devices. # NATM enables the netnatm protocol family that can be used to # bypass TCP/IP. # -# utopia provides the access to the ATM PHY chips and is required for en -# and hatm +# utopia provides the access to the ATM PHY chips and is required for en, +# hatm and fatm. # # the current driver supports only PVC operations (no atm-arp, no multicast). # for more details, please read the original documents at @@ -1691,6 +1693,7 @@ # device atm device en +device fatm #Fore PCA200E device hatm #Fore/Marconi HE155/622 device utopia #ATM PHY driver options NATM #native ATM ==== //depot/projects/ia64/sys/conf/files#83 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.796 2003/06/22 02:18:31 iedowse Exp $ +# $FreeBSD: src/sys/conf/files,v 1.797 2003/06/23 14:46:11 harti Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -392,6 +392,7 @@ dev/ex/if_ex_pccard.c optional ex card #dev/ex/if_ex_pccard.c optional ex pccard dev/exca/exca.c optional cbb +dev/fatm/if_fatm.c optional fatm pci dev/fe/if_fe.c optional fe dev/fe/if_fe_pccard.c optional fe card dev/fe/if_fe_pccard.c optional fe pccard ==== //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#7 (text+ko) ==== @@ -510,8 +510,8 @@ ACPI_REGISTER_INSERT_VALUE (RegisterValue, BitRegInfo->BitPosition, BitRegInfo->AccessBitMask, Value); - Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, RegisterId, - (UINT16) RegisterValue); + Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, + ACPI_REGISTER_PM1_CONTROL, (UINT16) RegisterValue); break; ==== //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#14 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#199 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.20 2003/06/06 23:53:39 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.21 2003/06/23 22:06:34 gibbs Exp $ */ #ifdef __linux__ @@ -378,7 +378,7 @@ * Wait for any inprogress DMA to complete and clear DMA state * if this if for an SCB in the qinfifo. */ - while ((ccscbctl = ahd_inb(ahd, CCSCBCTL) & (CCARREN|CCSCBEN)) != 0) { + while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) { if ((ccscbctl & (CCSCBDIR|CCARREN)) == (CCSCBDIR|CCARREN)) { if ((ccscbctl & ARRDONE) != 0) ==== //depot/projects/ia64/sys/dev/fxp/if_fxp.c#35 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.183 2003/06/12 16:43:30 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.184 2003/06/23 23:23:49 njl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1733,7 +1733,17 @@ m->m_pkthdr.len = m->m_len = total_len; m->m_pkthdr.rcvif = ifp; + /* + * Drop locks before calling if_input() since it + * may re-enter fxp_start() in the netisr case. + * This would result in a lock reversal. Better + * performance might be obtained by chaining all + * packets received, dropping the lock, and then + * calling if_input() on each one. + */ + FXP_UNLOCK(sc); (*ifp->if_input)(ifp, m); + FXP_LOCK(sc); } } if (rnr) { ==== //depot/projects/ia64/sys/dev/vinum/vinumio.c#18 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.89 2003/06/15 01:42:01 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.90 2003/06/23 14:49:57 harti Exp $ */ #include <dev/vinum/vinumhdr.h> @@ -800,7 +800,6 @@ } } } -#ifdef __i386__ /* * This is a kludge. Probably none of this * should be here. @@ -828,7 +827,6 @@ } } } -#endif } Free(partname); ==== //depot/projects/ia64/sys/kern/kern_tc.c#23 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.149 2003/06/11 00:56:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.150 2003/06/23 20:14:08 imp Exp $"); #include "opt_ntp.h" @@ -308,7 +308,7 @@ } /* - * Step our concept of GMT. This is done by modifying our estimate of + * Step our concept of UTC. This is done by modifying our estimate of * when we booted. XXX: needs futher work. */ void @@ -423,7 +423,7 @@ scale /= th->th_counter->tc_frequency; th->th_scale = scale * 2; - /* Update the GMT timestamps used for the get*() functions. */ + /* Update the UTC timestamps used for the get*() functions. */ bt = th->th_offset; bintime_add(&bt, &boottimebin); bintime2timeval(&bt, &th->th_microtime); ==== //depot/projects/ia64/sys/modules/Makefile#54 (text+ko) ==== @@ -1,12 +1,14 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.330 2003/06/17 16:12:49 harti Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.333 2003/06/23 22:01:01 iedowse Exp $ -.if exists(${.CURDIR}/../opencrypto) && !defined(NOCRYPT) +.if !defined(NOCRYPT) || defined(ALL_MODULES) +.if exists(${.CURDIR}/../opencrypto) _crypto= crypto _cryptodev= cryptodev .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../crypto) _random= random .endif +.endif SUBDIR= accf_data \ accf_http \ @@ -30,6 +32,7 @@ digi \ dummynet \ en \ + fatm \ fdc \ fdescfs \ firewire \ @@ -99,6 +102,7 @@ rp \ rue \ sbsh \ + scd \ sf \ sis \ sk \ @@ -143,11 +147,11 @@ wlan \ xl -.if defined(WANT_EXT2FS_MODULE) +.if defined(WANT_EXT2FS_MODULE) || defined(ALL_MODULES) SUBDIR+=ext2fs .endif -.if !defined(NO_IPFILTER) +.if !defined(NO_IPFILTER) || defined(ALL_MODULES) SUBDIR+=ipfilter .endif @@ -292,6 +296,10 @@ SUBDIR+=hme .endif +.if defined(ALL_MODULES) +SUBDIR+=ufs +.endif + .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) SUBDIR=${MODULES_OVERRIDE} .endif ==== //depot/projects/ia64/sys/modules/ufs/Makefile#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.1 2002/06/30 02:23:12 iedowse Exp $ +# $FreeBSD: src/sys/modules/ufs/Makefile,v 1.2 2003/06/23 19:41:00 iedowse Exp $ .PATH: ${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs KMOD= ufs -SRCS= opt_ddb.h opt_ffs.h opt_ffs_broken_fixme.h opt_quota.h opt_suiddir.h \ - opt_ufs.h vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \ +SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h opt_mac.h \ + opt_quota.h opt_suiddir.h opt_ufs.h \ + vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \ ufs_ihash.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \ ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \ ffs_softdep.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c ==== //depot/projects/ia64/sys/net/if_atmsubr.c#12 (text+ko) ==== @@ -31,12 +31,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_atmsubr.c,v 1.27 2003/05/31 20:07:16 phk Exp $ + * if_atmsubr.c */ -/* - * if_atmsubr.c - */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/net/if_atmsubr.c,v 1.29 2003/06/23 16:53:28 harti Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -71,13 +70,37 @@ #include <netnatm/natm.h> #endif +/* + * Netgraph interface functions. + * These need not be protected by a lock, because ng_atm nodes are persitent. + * The ng_atm module can be unloaded only if all ATM interfaces have been + * unloaded, so nobody should be in the code paths accessing these function + * pointers. + */ +void (*ng_atm_attach_p)(struct ifnet *); +void (*ng_atm_detach_p)(struct ifnet *); +int (*ng_atm_output_p)(struct ifnet *, struct mbuf **); +void (*ng_atm_input_p)(struct ifnet *, struct mbuf **, + struct atm_pseudohdr *, void *); +void (*ng_atm_input_orphan_p)(struct ifnet *, struct mbuf *, + struct atm_pseudohdr *, void *); +void (*ng_atm_message_p)(struct ifnet *, u_int32_t, u_int32_t); + +/* + * Harp pseudo interface hooks + */ +void (*atm_harp_input_p)(struct ifnet *ifp, struct mbuf **m, + struct atm_pseudohdr *ah, void *rxhand); +void (*atm_harp_attach_p)(struct ifnet *); +void (*atm_harp_detach_p)(struct ifnet *); + SYSCTL_NODE(_hw, OID_AUTO, atm, CTLFLAG_RW, 0, "ATM hardware"); #ifndef ETHERTYPE_IPV6 -#define ETHERTYPE_IPV6 0x86dd +#define ETHERTYPE_IPV6 0x86dd #endif -#define senderr(e) do { error = (e); goto bad;} while (0) +#define senderr(e) do { error = (e); goto bad; } while (0) /* * atm_output: ATM output routine @@ -93,13 +116,9 @@ * [for native mode ATM output] if dst is null, then * rt0 must also be NULL. */ - int -atm_output(ifp, m0, dst, rt0) - struct ifnet *ifp; - struct mbuf *m0; - struct sockaddr *dst; - struct rtentry *rt0; +atm_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, + struct rtentry *rt0) { u_int16_t etype = 0; /* if using LLC/SNAP */ int error = 0, sz; @@ -116,7 +135,7 @@ senderr(error); #endif - if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) + if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) != (IFF_UP | IFF_RUNNING)) senderr(ENETDOWN); /* @@ -131,6 +150,7 @@ */ if (dst) { switch (dst->sa_family) { + #if defined(INET) || defined(INET6) case AF_INET: case AF_INET6: @@ -154,7 +174,8 @@ * (atm pseudo header (4) + LLC/SNAP (8)) */ bcopy(dst->sa_data, &atmdst, sizeof(atmdst)); - llc_hdr = (struct atmllc *)(dst->sa_data + sizeof(atmdst)); + llc_hdr = (struct atmllc *)(dst->sa_data + + sizeof(atmdst)); break; default: @@ -173,7 +194,8 @@ */ sz = sizeof(atmdst); atm_flags = ATM_PH_FLAGS(&atmdst); - if (atm_flags & ATM_PH_LLCSNAP) sz += 8; /* sizeof snap == 8 */ + if (atm_flags & ATM_PH_LLCSNAP) + sz += 8; /* sizeof snap == 8 */ M_PREPEND(m, sz, M_DONTWAIT); if (m == 0) senderr(ENOBUFS); @@ -184,19 +206,29 @@ if (llc_hdr == NULL) { bcopy(ATMLLC_HDR, atmllc->llchdr, sizeof(atmllc->llchdr)); + /* note: in host order */ ATM_LLC_SETTYPE(atmllc, etype); - /* note: in host order */ } else bcopy(llc_hdr, atmllc, sizeof(struct atmllc)); } } + if (ng_atm_output_p != NULL) { + if ((error = (*ng_atm_output_p)(ifp, &m)) != 0) { + if (m != NULL) + m_freem(m); + return (error); + } + if (m == NULL) + return (0); + } + /* * Queue message on interface, and start output if interface * not yet active. */ - if (! IF_HANDOFF(&ifp->if_snd, m, ifp)) + if (!IF_HANDOFF(&ifp->if_snd, m, ifp)) return (ENOBUFS); return (error); @@ -211,14 +243,11 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306240117.h5O1HFDj033033>