Date: Tue, 2 Apr 2002 11:59:37 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8908 for review Message-ID: <200204021959.g32JxbZ01794@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8908 Change 8908 by jhb@jhb_laptop on 2002/04/02 11:59:19 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/critical.c#2 integrate ... //depot/projects/smpng/sys/alpha/include/cpufunc.h#7 integrate ... //depot/projects/smpng/sys/alpha/include/critical.h#1 branch ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/help.sparc64#1 branch ... //depot/projects/smpng/sys/boot/sparc64/loader/locore.S#1 branch ... //depot/projects/smpng/sys/boot/sparc64/loader/locore.s#5 delete ... //depot/projects/smpng/sys/boot/sparc64/loader/main.c#6 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#4 integrate ... //depot/projects/smpng/sys/conf/NOTES#1 branch ... //depot/projects/smpng/sys/conf/files#31 integrate ... //depot/projects/smpng/sys/conf/options#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#10 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.h#8 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#20 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#12 integrate ... //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#8 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs#12 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#12 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#15 integrate ... //depot/projects/smpng/sys/dev/usb/uhub.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#9 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#6 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#8 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#5 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#5 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#26 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#9 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/smpng/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#3 integrate ... //depot/projects/smpng/sys/i386/i386/critical.c#2 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#13 integrate ... //depot/projects/smpng/sys/i386/include/critical.h#1 branch ... //depot/projects/smpng/sys/i386/isa/apic_vector.s#11 integrate ... //depot/projects/smpng/sys/i386/isa/icu_vector.s#10 integrate ... //depot/projects/smpng/sys/i386/isa/matcd/matcd.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/mcd.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/scd.c#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/critical.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#29 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#12 integrate ... //depot/projects/smpng/sys/ia64/include/critical.h#1 branch ... //depot/projects/smpng/sys/isa/fd.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#30 integrate ... //depot/projects/smpng/sys/kern/kern_mib.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#21 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_sx.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#17 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#38 integrate ... //depot/projects/smpng/sys/kern/tty.c#16 integrate ... //depot/projects/smpng/sys/modules/wi/Makefile#4 integrate ... //depot/projects/smpng/sys/powerpc/include/cpufunc.h#11 integrate ... //depot/projects/smpng/sys/powerpc/include/critical.h#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/critical.c#2 integrate ... //depot/projects/smpng/sys/sparc64/include/cpufunc.h#15 integrate ... //depot/projects/smpng/sys/sparc64/include/critical.h#1 branch ... //depot/projects/smpng/sys/sparc64/include/iommureg.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/tlb.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/upa.h#4 integrate ... //depot/projects/smpng/sys/sparc64/isa/isa.c#4 integrate ... //depot/projects/smpng/sys/sparc64/pci/psycho.c#6 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/critical.c#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#19 integrate ... //depot/projects/smpng/sys/sys/_mutex.h#7 integrate ... //depot/projects/smpng/sys/sys/ata.h#8 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#11 integrate ... //depot/projects/smpng/sys/sys/eventhandler.h#4 integrate ... //depot/projects/smpng/sys/sys/kerneldump.h#2 integrate ... //depot/projects/smpng/sys/sys/mutex.h#21 integrate ... //depot/projects/smpng/sys/sys/sx.h#11 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#19 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/critical.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. * - * $FreeBSD: src/sys/alpha/alpha/critical.c,v 1.2 2002/03/28 02:54:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/critical.c,v 1.3 2002/04/01 23:51:21 dillon Exp $ */ #include <sys/param.h> @@ -18,24 +18,7 @@ #include <sys/mutex.h> #include <sys/sysctl.h> #include <sys/ucontext.h> - -void -cpu_critical_enter(void) -{ - struct thread *td; - - td = curthread; - td->td_md.md_savecrit = intr_disable(); -} - -void -cpu_critical_exit(void) -{ - struct thread *td; - - td = curthread; - intr_restore(td->td_md.md_savecrit); -} +#include <machine/critical.h> /* * cpu_critical_fork_exit() - cleanup after fork ==== //depot/projects/smpng/sys/alpha/include/cpufunc.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.15 2002/04/01 23:51:22 dillon Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -59,11 +59,6 @@ alpha_pal_swpipl(ipl); } -void cpu_critical_enter(void); -void cpu_critical_exit(void); -void cpu_critical_fork_exit(void); -void cpu_thread_link(struct thread *td); - #endif /* _KERNEL */ #endif /* !_MACHINE_CPUFUNC_H_ */ ==== //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#2 (text+ko) ==== @@ -1,19 +1,29 @@ -# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.2 2002/03/05 16:39:36 robert Exp $ +# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.3 2002/04/01 22:57:51 tmm Exp $ + +PROG= boot1 +SRCS= _start.S boot1.c +NOMAN= +STRIP= +BINDIR?= /boot +BINMODE= 444 BOOTBLOCKBASE= 0x4000 -CFLAGS= -W -Wall -I../../ -I../../common/ -Os \ - -DBOOTBLOCKBASE=${BOOTBLOCKBASE} \ - -ffreestanding -mno-app-regs -mcmodel=medlow -OBJ= boot1.o +CFLAGS= -W -Wall -I../../ -I../../common/ -Os -ffreestanding -mno-app-regs \ + -mcmodel=medlow + +boot1.elf: _start.o boot1.o + ${LD} -N -Ttext ${BOOTBLOCKBASE} -o ${.TARGET} _start.o boot1.o + +boot1.aout: boot1.elf + /usr/local/bin/elftoaout -o ${.TARGET} boot1.elf -all: boot1 +# Construct boot1. disklabel expects it to contain zeroed-out space for the +# label, and to be of the correct size. +boot1: boot1.aout + dd if=/dev/zero of=${.TARGET} bs=512 count=16 + dd if=boot1.aout of=${.TARGET} bs=512 oseek=1 conv=notrunc -boot1.o: boot1.c - ${CC} ${CFLAGS} -c -o ${.TARGET} ${.ALLSRC} +CLEANFILES+= boot1.elf boot1.aout -boot1: ${OBJ} - ${LD} -N -Ttext ${BOOTBLOCKBASE} -e main -o boot1 ${OBJ} - /usr/local/bin/elftoaout boot1 -clean: - rm -f *.o boot1 +.include <bsd.prog.mk> ==== //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#5 (text+ko) ==== @@ -1,19 +1,29 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.4 2002/02/23 04:35:28 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.6 2002/04/02 17:08:37 tmm Exp $ BASE= loader PROG= ${BASE} NEWVERSWHAT= "bootstrap loader" sparc64 +BINDIR?= /boot +INSTALLFLAGS= -b CFLAGS= -mno-app-regs -LOADER_DISK_SUPPORT?= no -LOADER_NET_SUPPORT?= yes -LOADER_NFS_SUPPORT?= yes -LOADER_TFTP_SUPPORT?= yes +LOADER_DISK_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes +LOADER_CD9660_SUPPORT?= no +LOADER_NET_SUPPORT?= no +LOADER_NFS_SUPPORT?= no +LOADER_TFTP_SUPPORT?= no .if ${LOADER_DISK_SUPPORT} == "yes" CFLAGS+= -DLOADER_DISK_SUPPORT .endif +.if ${LOADER_UFS_SUPPORT} == "yes" +CFLAGS+= -DLOADER_UFS_SUPPORT +.endif +.if ${LOADER_CD9660_SUPPORT} == "yes" +CFLAGS+= -DLOADER_CD9660_SUPPORT +.endif .if ${LOADER_NET_SUPPORT} == "yes" CFLAGS+= -DLOADER_NET_SUPPORT .endif @@ -25,7 +35,7 @@ .endif # Architecture-specific loader code -SRCS= locore.s main.c metadata.c +SRCS= locore.S main.c metadata.c # Always add MI sources .PATH: ${.CURDIR}/../../common @@ -33,10 +43,11 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../.. -I. -CLEANFILES+= ${PROG} +CLEANFILES+= ${PROG}.help CFLAGS+= -W -Wall -ffreestanding -LDFLAGS= -X -static +LDFLAGS= -nostdlib -static +LDADD= ${LIBSTAND} ${LIBOFW} # where to get libstand from #XXX need a better way to do this @@ -47,33 +58,25 @@ LIBSTAND= -lstand .endif .endif -LIBOFW= ${.CURDIR}/../../ofw/libofw/libofw.a +LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ -# Debug me! -#CFLAGS+= -g -#LDFLAGS+= -g +${BASE}.help: help.common help.sparc64 + cat ${.ALLSRC} | \ + awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} -${PROG}: ${OBJS} - ${LD} -o ${.TARGET} ${OBJS} ${LIBOFW} ${LIBSTAND} ${LDFLAGS} - -locore.o: locore.s - ${CC} ${CFLAGS} -D_LOCORE -xassembler-with-cpp -c locore.s -o locore.o -main.o: main.c - ${CC} ${CFLAGS} -c main.c -o main.o - -beforeinstall: +beforeinstall: ${PROG}.help .if exists(${DESTDIR}/boot/loader) mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old .endif -.if exists(${.OBJDIR}/loader.help) +#.if exists(${.OBJDIR}/loader.help) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif +#.else +# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ +# ${.CURDIR}/${BASE}.help ${DESTDIR}/boot +#.endif .if !exists(${DESTDIR}/boot/loader.rc) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot ==== //depot/projects/smpng/sys/boot/sparc64/loader/main.c#6 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.6 2002/03/01 06:17:28 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.8 2002/04/02 17:10:15 tmm Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -52,8 +52,8 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); -extern void itlb_enter(int slot, u_long vpn, u_long data); -extern void dtlb_enter(int slot, u_long vpn, u_long data); +extern void itlb_enter(u_long vpn, u_long data); +extern void dtlb_enter(u_long vpn, u_long data); extern vm_offset_t itlb_va_to_pa(vm_offset_t); extern vm_offset_t dtlb_va_to_pa(vm_offset_t); extern vm_offset_t md_load(char *, vm_offset_t *); @@ -105,6 +105,9 @@ #ifdef LOADER_UFS_SUPPORT &ufs_fsops, #endif +#ifdef LOADER_CD9660_SUPPORT + &cd9660_fsops, +#endif #ifdef LOADER_NET_SUPPORT &nfs_fsops, #endif @@ -239,10 +242,6 @@ vm_offset_t pa, mva; struct tte tte; - if (dtlb_slot < 0) - panic("mmu_mapin: out of dtlb_slots"); - if (itlb_slot < 0) - panic("mmu_mapin: out of itlb_slots"); if (va + len > curkva) curkva = va + len; @@ -268,13 +267,21 @@ /* The mappings may have changed, be paranoid. */ continue; } + /* + * Actually, we can only allocate two pages less at + * most (depending on the kernel TSB size). + */ + if (dtlb_slot >= dtlb_slot_max) + panic("mmu_mapin: out of dtlb_slots"); + if (itlb_slot >= itlb_slot_max) + panic("mmu_mapin: out of itlb_slots"); tte.tte_vpn = TV_VPN(va); tte.tte_data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; - dtlb_store[--dtlb_slot] = tte; - itlb_store[--itlb_slot] = tte; - dtlb_enter(dtlb_slot, tte.tte_vpn, tte.tte_data); - itlb_enter(itlb_slot, tte.tte_vpn, tte.tte_data); + dtlb_store[dtlb_slot++] = tte; + itlb_store[itlb_slot++] = tte; + dtlb_enter(tte.tte_vpn, tte.tte_data); + itlb_enter(tte.tte_vpn, tte.tte_data); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; @@ -333,8 +340,6 @@ itlb_store = malloc(itlb_slot_max * sizeof(*itlb_store)); if (dtlb_store == NULL || itlb_store == NULL) panic("init_tlb: malloc"); - dtlb_slot = dtlb_slot_max; - itlb_slot = itlb_slot_max; } int @@ -388,6 +393,22 @@ switch (bootdev.d_type) { case DEVT_DISK: bootdev.d_dev = &ofwdisk; + /* + * Sun compatible bootable CD-ROMs have a disk label placed + * before the cd9660 data, with the actual file system being + * in the first partition, while the other partitions contain + * pseudo disk labels with embedded boot blocks for different + * architectures, which may be followed by UFS file systems. + * The firmware will set the boot path to the partition it + * boots from ('f' in the sun4u case), but we want the kernel + * to be loaded from the cd9660 fs ('a'), so the boot path + * needs to be altered. + */ + if (strstr(bootpath, "cdrom") != NULL && + bootpath[strlen(bootpath) - 2] == ':') { + bootpath[strlen(bootpath) - 1] = 'a'; + printf("Boot path set to %s\n", bootpath); + } strncpy(bootdev.d_kind.ofwdisk.path, bootpath, 64); ofw_parseofwdev(&bootdev, bootpath); break; ==== //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.3 2002/02/23 11:06:37 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.4 2002/04/02 17:10:15 tmm Exp $ */ #include <stand.h> @@ -319,9 +319,9 @@ file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slots, &dtlb_slots); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slots, &itlb_slots); file_addmetadata(kfp, MODINFOMD_DTLB, dtlb_slots * sizeof(struct tte), - &dtlb_store[dtlb_slot]); + dtlb_store); file_addmetadata(kfp, MODINFOMD_ITLB, itlb_slots * sizeof(struct tte), - &itlb_store[itlb_slot]); + itlb_store); *modulep = addr; size = md_copymodules(0); ==== //depot/projects/smpng/sys/conf/files#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.617 2002/03/30 17:41:23 mdodd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.618 2002/04/02 02:50:48 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -623,7 +623,9 @@ #dev/wlp/if_wlp.c optional wlp card dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi -dev/wi/if_wi.c optional wi pccard +dev/wi/if_wi_pccard.c optional wi pccard +dev/wi/if_wi_pccard.c optional wi card +dev/wi/if_wi_pci.c optional wi pci dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe card ==== //depot/projects/smpng/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.307 2002/04/01 05:35:23 jake Exp $ +# $FreeBSD: src/sys/conf/options,v 1.308 2002/04/02 00:01:47 des Exp $ # # On the handling of kernel options # @@ -519,3 +519,6 @@ # Polling device handling DEVICE_POLLING opt_global.h + +# Mutex profiling +MUTEX_PROFILING opt_global.h ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#16 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/ata-all.c,v 1.143 2002/03/30 16:51:47 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.144 2002/04/02 13:47:23 sos Exp $ */ #include "opt_ata.h" @@ -415,6 +415,9 @@ case ATARAIDDELETE: return ata_raid_delete(iocmd->channel); + + case ATARAIDSTATUS: + return ata_raid_status(iocmd->channel, &iocmd->u.raid_status); #endif #if defined(DEV_ATAPICD) || defined(DEV_ATAPIFD) || defined(DEV_ATAPIST) case ATAPICMD: { ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#16 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/ata-dma.c,v 1.91 2002/03/31 13:33:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.92 2002/04/02 16:45:06 sos Exp $ */ #include <sys/param.h> @@ -411,7 +411,7 @@ { 0x00, 0x00, 0xf6, 0x00, 0xf2, 0xf1, 0xf0 }}; /* ATA133 */ int *reg_val = NULL; - if (ata_find_dev(parent, 0x31471106, 0x40)) { /* 8233a */ + if (ata_find_dev(parent, 0x31471106, 0)) { /* 8233a */ udmamode = imin(udmamode, 6); reg_val = via_modes[3]; } @@ -427,7 +427,7 @@ udmamode = imin(udmamode, 4); reg_val = via_modes[1]; } - else if (ata_find_dev(parent, 0x06861106, 0x0)) { /* 82C686 */ + else if (ata_find_dev(parent, 0x06861106, 0)) { /* 82C686 */ udmamode = imin(udmamode, 2); reg_val = via_modes[1]; } @@ -509,17 +509,17 @@ case 0x55131039: /* SiS 5591 */ if (ata_find_dev(parent, 0x06301039, 0x30) || /* SiS 630 */ - ata_find_dev(parent, 0x06331039, 0x00) || /* SiS 633 */ - ata_find_dev(parent, 0x06351039, 0x00) || /* SiS 635 */ - ata_find_dev(parent, 0x06401039, 0x00) || /* SiS 640 */ - ata_find_dev(parent, 0x06451039, 0x00) || /* SiS 645 */ - ata_find_dev(parent, 0x06501039, 0x00) || /* SiS 650 */ - ata_find_dev(parent, 0x07301039, 0x00) || /* SiS 730 */ - ata_find_dev(parent, 0x07331039, 0x00) || /* SiS 733 */ - ata_find_dev(parent, 0x07351039, 0x00) || /* SiS 735 */ - ata_find_dev(parent, 0x07401039, 0x00) || /* SiS 740 */ - ata_find_dev(parent, 0x07451039, 0x00) || /* SiS 745 */ - ata_find_dev(parent, 0x07501039, 0x00)) { /* SiS 750 */ + ata_find_dev(parent, 0x06331039, 0) || /* SiS 633 */ + ata_find_dev(parent, 0x06351039, 0) || /* SiS 635 */ + ata_find_dev(parent, 0x06401039, 0) || /* SiS 640 */ + ata_find_dev(parent, 0x06451039, 0) || /* SiS 645 */ + ata_find_dev(parent, 0x06501039, 0) || /* SiS 650 */ + ata_find_dev(parent, 0x07301039, 0) || /* SiS 730 */ + ata_find_dev(parent, 0x07331039, 0) || /* SiS 733 */ + ata_find_dev(parent, 0x07351039, 0) || /* SiS 735 */ + ata_find_dev(parent, 0x07401039, 0) || /* SiS 740 */ + ata_find_dev(parent, 0x07451039, 0) || /* SiS 745 */ + ata_find_dev(parent, 0x07501039, 0)) { /* SiS 750 */ int8_t reg = 0x40 + (devno << 1); int16_t val = pci_read_config(parent, reg, 2) & 0x0fff; ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#16 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/ata-pci.c,v 1.35 2002/03/24 12:44:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.36 2002/04/02 16:45:06 sos Exp $ */ #include <sys/param.h> @@ -181,22 +181,22 @@ case 0x55131039: if (ata_find_dev(dev, 0x06301039, 0x30) || - ata_find_dev(dev, 0x06331039, 0x00) || - ata_find_dev(dev, 0x06351039, 0x00) || - ata_find_dev(dev, 0x06401039, 0x00) || - ata_find_dev(dev, 0x06451039, 0x00) || - ata_find_dev(dev, 0x06501039, 0x00) || - ata_find_dev(dev, 0x07301039, 0x00) || - ata_find_dev(dev, 0x07331039, 0x00) || - ata_find_dev(dev, 0x07351039, 0x00) || - ata_find_dev(dev, 0x07401039, 0x00) || - ata_find_dev(dev, 0x07451039, 0x00) || - ata_find_dev(dev, 0x07501039, 0x00)) + ata_find_dev(dev, 0x06331039, 0) || + ata_find_dev(dev, 0x06351039, 0) || + ata_find_dev(dev, 0x06401039, 0) || + ata_find_dev(dev, 0x06451039, 0) || + ata_find_dev(dev, 0x06501039, 0) || + ata_find_dev(dev, 0x07301039, 0) || + ata_find_dev(dev, 0x07331039, 0) || + ata_find_dev(dev, 0x07351039, 0) || + ata_find_dev(dev, 0x07401039, 0) || + ata_find_dev(dev, 0x07451039, 0) || + ata_find_dev(dev, 0x07501039, 0)) return "SiS 5591 ATA100 controller"; - else if (ata_find_dev(dev, 0x05301039, 0x00) || - ata_find_dev(dev, 0x05401039, 0x00) || - ata_find_dev(dev, 0x06201039, 0x00) || - ata_find_dev(dev, 0x06301039, 0x00)) + else if (ata_find_dev(dev, 0x05301039, 0) || + ata_find_dev(dev, 0x05401039, 0) || + ata_find_dev(dev, 0x06201039, 0) || + ata_find_dev(dev, 0x06301039, 0)) return "SiS 5591 ATA66 controller"; else return "SiS 5591 ATA33 controller"; ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#10 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/ata-raid.c,v 1.43 2002/03/30 11:15:46 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.44 2002/04/02 13:47:23 sos Exp $ */ #include "opt_ata.h" @@ -404,7 +404,50 @@ ar_table[array] = NULL; return 0; } - + +int +ata_raid_status(int array, struct raid_status *status) +{ + struct ar_softc *rdp; + int i; + + if (!ar_table || !(rdp = ar_table[array])) + return ENXIO; + + switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { + case AR_F_RAID0: + status->type = AR_RAID0; + break; + case AR_F_RAID1: + status->type = AR_RAID1; + break; + case AR_F_RAID0 | AR_F_RAID1: + status->type = AR_RAID0 | AR_RAID1; + break; + case AR_F_SPAN: + status->type = AR_SPAN; + break; + } + status->total_disks = rdp->total_disks; + for (i = 0; i < rdp->total_disks; i++ ) { + if ((rdp->disks[i].flags & AR_DF_PRESENT) && rdp->disks[i].device) + status->disks[i] = AD_SOFTC(rdp->disks[i])->lun; + else + status->disks[i] = -1; + } + status->interleave = rdp->interleave; + status->status = 0; + if (rdp->flags & AR_F_READY) + status->status |= AR_READY; + if (rdp->flags & AR_F_DEGRADED) + status->status |= AR_DEGRADED; + if (rdp->flags & AR_F_REBUILDING) { + status->status |= AR_REBUILDING; + status->progress = 100*rdp->lock_start/(rdp->total_sectors/rdp->width); + } + return 0; +} + int ata_raid_rebuild(int array) { ==== //depot/projects/smpng/sys/dev/ata/ata-raid.h#8 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/ata-raid.h,v 1.16 2002/03/27 10:58:59 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.17 2002/04/02 13:47:23 sos Exp $ */ /* misc defines */ @@ -228,4 +228,5 @@ void ata_raid_attach(void); int ata_raid_create(struct raid_setup *); int ata_raid_delete(int); +int ata_raid_status(int array, struct raid_status *); int ata_raid_rebuild(int); ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#20 (text+ko) ==== @@ -25,7 +25,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/sys/dev/ata/atapi-cd.c,v 1.115 2002/04/01 21:30:31 jhb Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.116 2002/04/02 11:52:06 phk Exp $ */ #include "opt_ata.h" @@ -1038,11 +1038,6 @@ error = EBADF; break; - case DIOCGPART: - ((struct partinfo *)addr)->disklab = &cdp->disklabel; - ((struct partinfo *)addr)->part = &cdp->disklabel.d_partitions[0]; - break; - default: error = ENOTTY; } ==== //depot/projects/smpng/sys/dev/ccd/ccd.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.100 2002/03/29 21:12:11 phk Exp $ */ +/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.102 2002/04/02 11:52:08 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -391,10 +391,11 @@ struct vnode *vp; size_t minsize; int maxsecsize; - struct partinfo dpart; struct ccdgeom *ccg = &cs->sc_geom; char *tmppath = NULL; int error = 0; + off_t mediasize; + u_int sectorsize; #ifdef DEBUG if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) @@ -439,8 +440,9 @@ /* * Get partition information for the component. */ - if ((error = VOP_IOCTL(vp, DIOCGPART, (caddr_t)&dpart, - FREAD, td->td_ucred, td)) != 0) { + error = VOP_IOCTL(vp, DIOCGMEDIASIZE, (caddr_t)&mediasize, + FREAD, td->td_ucred, td); + if (error != 0) { #ifdef DEBUG if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) printf("ccd%d: %s: ioctl failed, error = %d\n", @@ -448,20 +450,22 @@ #endif goto fail; } - if (dpart.part->p_fstype == FS_BSDFFS) { - maxsecsize = - ((dpart.disklab->d_secsize > maxsecsize) ? - dpart.disklab->d_secsize : maxsecsize); - size = dpart.part->p_size - CCD_OFFSET; - } else { + /* + * Get partition information for the component. + */ + error = VOP_IOCTL(vp, DIOCGSECTORSIZE, (caddr_t)§orsize, + FREAD, td->td_ucred, td); + if (error != 0) { #ifdef DEBUG if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) - printf("ccd%d: %s: incorrect partition type\n", - cs->sc_unit, ci->ci_path); + printf("ccd%d: %s: ioctl failed, error = %d\n", + cs->sc_unit, ci->ci_path, error); #endif - error = EFTYPE; goto fail; } + if (sectorsize > maxsecsize) + maxsecsize = sectorsize; + size = mediasize / DEV_BSIZE - CCD_OFFSET; /* * Calculate the size, truncating to an interleave @@ -1501,15 +1505,6 @@ *(struct disklabel *)data = cs->sc_label; break; - case DIOCGPART: - if (!IS_INITED(cs)) - return (ENXIO); - - ((struct partinfo *)data)->disklab = &cs->sc_label; - ((struct partinfo *)data)->part = - &cs->sc_label.d_partitions[ccdpart(dev)]; - break; - case DIOCWDINFO: case DIOCSDINFO: if (!IS_INITED(cs)) ==== //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.37 2002/01/29 07:08:56 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.38 2002/04/02 05:52:52 imp Exp $ */ #include "opt_ed.h" @@ -159,6 +159,8 @@ * PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID * in front of this comment. */ + { PCMCIA_CARD(LANTECH, FASTNETTX, 0), + -1, { 0x00, 0x04, 0x1c}, NE2000DVF_AX88190 }, { PCMCIA_CARD(IBM, INFOMOVER, 0), 0x0ff0, { 0x08, 0x00, 0x5a } }, { PCMCIA_CARD(IBM, INFOMOVER, 0), @@ -169,14 +171,20 @@ -1, { 0, 0, 0 }, 0 }, /* XXX */ { PCMCIA_CARD(LINKSYS, ECARD_1, 0), -1, { 0x00, 0x80, 0xc8 } }, + { PCMCIA_CARD(LINKSYS, PCM100, 0), + -1, { 0x00, 0x04, 0x5a } }, #ifdef BOGUS + /* + * The next three should be detected as linksys, but might fail + * the mac sanity check. + */ { PCMCIA_CARD(PLANEX, FNW3600T, 0), -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 }, { PCMCIA_CARD(PLANEX, FNW3700T, 0), -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 }, -#endif { PCMCIA_CARD(SVEC, PN650TX, 0), -1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 }, +#endif /* * This entry should be here so that above two cards doesn't @@ -289,6 +297,11 @@ 0x00b8, { 0x08, 0x00, 0x42 } }, { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0), 0x0ff0, { 0x00, 0x00, 0xf4 } }, + { PCMCIA_CARD(NETGEAR, FA410TXC, 0), + -1, { 0x00, 0x48, 0x54 } }, + { PCMCIA_CARD(NETGEAR, FA411, 0), + -1, { 0x00, 0x40, 0xf4 } }, + #if 0 /* the rest of these are stolen from the linux pcnet pcmcia device driver. Since I don't know the manfid or cis info strings for ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs#12 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.28 2002/03/17 05:05:42 imp Exp $ -/* $NetBSD: pcmciadevs,v 1.159 2002/01/28 09:25:33 aymeric Exp $ */ -/* $OpenBSD: pcmciadevs,v 1.71 2001/10/28 19:21:37 mickey Exp $ */ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.30 2002/04/02 05:46:10 imp Exp $ +/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ +/* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -87,6 +87,7 @@ vendor BUFFALO 0x026f BUFFALO (Melco Corporation) vendor LINKSYS2 0x0274 The Linksys Group vendor IODATA2 0x028a I-O DATA +vendor NWN 0x0602 No Wires Needed vendor BREEZECOM 0x0a02 BreezeCOM vendor NEWMEDIA2 0x10cd NewMedia vendor LASAT 0x3401 Lasat Communications A/S @@ -241,6 +242,7 @@ product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650 product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card +product LINKSYS2 IWN2 0x1613 Instant Wireless Network PC Card /* Lucent WaveLAN/IEEE */ product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE @@ -275,6 +277,7 @@ /* Netgear */ product NETGEAR FA410TXC 0x4530 Netgear FA410TXC +product NETGEAR FA411 0x0411 Netgear FA411 /* National Instruments */ product NI PCMCIA_GPIB 0x4882 National Instruments PCMCIA-GPIB @@ -282,6 +285,10 @@ /* Nokia Products */ product NOKIA C020_WLAN 0x20c0 Nokia C020 WLAN Card +/* No Wires Needed */ +product NWN WLAN_550 0x0002 NWN 550 WLAN +product NWN WLAN_1148 0x0003 NWN 1148 WLAN + /* Olicom Products */ product OLICOM TR 0x2132 GoCard Token Ring 16/4 @@ -294,6 +301,7 @@ /* Proxim */ product PROXIM ROAMABOUT_2400FH 0x1058 Digital RoamAbout 2400FH product PROXIM RANGELAN2_7401 0x1158 Proxim RangeLAN2 7401 +product PROXIM RANGELANDS_8430 0x8000 Proxim RangeLAN-DS 8430 /* Psion */ product PSION GOLDCARD 0x0020 Psion Gold Card @@ -341,6 +349,7 @@ product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet product TDK LAK_CF010 0x0900 TDK LAC-CF010 product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular +product TDK C6500012 0x410a TDK ELSA MicroLink MC all /* Telecom Device */ product TELECOMDEVICE TCD_HPC100 0x0202 Telecom Device TCD-HPC100 @@ -370,6 +379,7 @@ */ vendor AMBICOM -1 AmbiCom Inc vendor ACCTON -1 ACCTON +vendor ADDTRON -1 Addtron vendor AMD -1 AMD vendor BILLIONTON -1 Billionton Systems Inc. vendor CNET -1 CNet @@ -381,6 +391,7 @@ vendor GEMTEK -1 Gem Tek vendor ICOM -1 ICOM Inc vendor INTERSIL -1 Intersil +vendor LANTECH -1 Lantech Computer Company vendor NAKAGAWAMETAL -1 NAKAGAWA METAL vendor NDC -1 NDC vendor PLANET -1 Planet @@ -394,6 +405,7 @@ vendor ZOOM -1 ZOOM product ACCTON EN2212 { "ACCTON", "EN2212", NULL, NULL } Accton EN2212 +product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL } product AMBICOM AMB8002T { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T product AMD AM79C930 { "AMD", "Am79C930", NULL, NULL } AMD Am79C930 product BILLIONTON LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card @@ -419,12 +431,18 @@ product EIGERLABS EPX_AA2000 { "Eiger&splabs,Inc.", "EPX-AA2000&spPC&spSound&spCard", NULL, NULL } EPX-AA2000 PC Sound Card product EPSON EEN10B { "Seiko&spEpson&spCorp.", "Ethernet", "P/N:&spEEN10B&spRev.&sp00", NULL } Epson EEN10B product EXP EXPMULTIMEDIA { "EXP&sp&sp&sp", "PnPIDE", "F1", NULL } EXP IDE/ATAPI DVD Card +product FUJITSU FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card +product FUJITSU FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card +product FUJITSU FMV_J182A { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.02", NULL } FUJITSU FMV-J182A PCMCIA Card +product FUJITSU ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard product GEMTEK WLAN { "Intersil", "PRISM&sp2_5&spPCMCIA&spADAPTER", "ISL37300P", "Eval-RevA" } GEMTEK Prism2_5 WaveLAN Card product ICOM SL200 { "Icom", "SL-200", NULL, NULL } Icom SL-200 product INTERSIL PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version&sp01.02", NULL } Intersil Prism II product IODATA CBIDE2 { "IO&spDATA", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } IO-DATA CBIDE2/16-bit mode product IODATA PCLAT { "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T +product LANTECH FASTNETTX { "ASIX", "AX88190", NULL, NULL } Lantech Fastnet/TX product LINKSYS ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } Linksys E-Card +product LINKSYS PCM100 { "Linksys", "EtherFast&sp10/100&spIntegrated&spPC&spCard&sp(PCM100)", "Ver&sp1.0", NULL } product MEGAHERTZ XJ2288 { "MEGAHERTZ", "MODEM&spXJ2288", NULL, NULL } Megahertz XJ2288 Modem product MELCO LPC2_TX { "MELCO", "LPC2-TX", NULL, NULL } Melco LPC2-TX product NAKAGAWAMETAL LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } NAKAGAWA METAL LNT-10TN NE2000 Compatible Card @@ -456,7 +474,3 @@ product XIRCOM CFE_10 { "Xircom", "CompactCard&spEthernet", "CFE-10", "1.00" } Xircom CompactCard CFE-10 product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD product ZOOM AIR_4000 { "Zoom", "Air-4000", NULL, NULL } Zoom Air-4000 -product FUJITSU FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card -product FUJITSU FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card -product FUJITSU FMV_J182A { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.02", NULL } FUJITSU FMV-J182A PCMCIA Card -product FUJITSU ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#12 (text+ko) ==== @@ -1,13 +1,13 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.28 2002/03/17 05:06:37 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.30 2002/04/02 05:47:08 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.28 2002/03/17 05:05:42 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.30 2002/04/02 05:46:10 imp Exp */ -/* $NetBSD: pcmciadevs,v 1.159 2002/01/28 09:25:33 aymeric Exp $ */ -/* $OpenBSD: pcmciadevs,v 1.71 2001/10/28 19:21:37 mickey Exp $ */ +/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ +/* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -94,6 +94,7 @@ #define PCMCIA_VENDOR_BUFFALO 0x026f /* BUFFALO (Melco Corporation) */ #define PCMCIA_VENDOR_LINKSYS2 0x0274 /* The Linksys Group */ #define PCMCIA_VENDOR_IODATA2 0x028a /* I-O DATA */ +#define PCMCIA_VENDOR_NWN 0x0602 /* No Wires Needed */ #define PCMCIA_VENDOR_BREEZECOM 0x0a02 /* BreezeCOM */ #define PCMCIA_VENDOR_NEWMEDIA2 0x10cd /* NewMedia */ #define PCMCIA_VENDOR_LASAT 0x3401 /* Lasat Communications A/S */ @@ -386,6 +387,9 @@ #define PCMCIA_CIS_LINKSYS2_IWN { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_LINKSYS2_IWN 0x1612 #define PCMCIA_STR_LINKSYS2_IWN "Instant Wireless Network PC Card" >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204021959.g32JxbZ01794>