Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Apr 2002 12:58:20 -0700 (PDT)
From:      John Baldwin <jhb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 9385 for review
Message-ID:  <200204081958.g38JwKf25432@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9385

Change 9385 by jhb@jhb_laptop on 2002/04/08 12:57:41

	IFC.

Affected files ...

... //depot/projects/smpng/sys/alpha/alpha/machdep.c#39 integrate
... //depot/projects/smpng/sys/boot/common/load_elf.c#3 integrate
... //depot/projects/smpng/sys/boot/efi/Makefile.inc#3 integrate
... //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 integrate
... //depot/projects/smpng/sys/boot/efi/loader/Makefile#7 integrate
... //depot/projects/smpng/sys/boot/ia64/Makefile.inc#1 branch
... //depot/projects/smpng/sys/boot/ia64/libski/Makefile#3 integrate
... //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#5 integrate
... //depot/projects/smpng/sys/conf/Makefile.ia64#17 integrate
... //depot/projects/smpng/sys/conf/files.pc98#22 integrate
... //depot/projects/smpng/sys/dev/aac/aac_pci.c#12 integrate
... //depot/projects/smpng/sys/dev/acpica/acpi.c#24 integrate
... //depot/projects/smpng/sys/dev/ata/ata-all.c#18 integrate
... //depot/projects/smpng/sys/dev/ata/ata-disk.c#17 integrate
... //depot/projects/smpng/sys/dev/ata/ata-dma.c#18 integrate
... //depot/projects/smpng/sys/dev/ata/ata-pci.c#18 integrate
... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#22 integrate
... //depot/projects/smpng/sys/dev/ccd/ccd.c#13 integrate
... //depot/projects/smpng/sys/dev/em/if_em.c#5 integrate
... //depot/projects/smpng/sys/dev/em/if_em.h#4 integrate
... //depot/projects/smpng/sys/dev/em/if_em_fxhw.c#4 integrate
... //depot/projects/smpng/sys/dev/em/if_em_fxhw.h#3 integrate
... //depot/projects/smpng/sys/dev/em/if_em_osdep.h#3 integrate
... //depot/projects/smpng/sys/dev/em/if_em_phy.c#3 integrate
... //depot/projects/smpng/sys/dev/em/if_em_phy.h#3 integrate
... //depot/projects/smpng/sys/dev/kbd/atkbd.c#3 integrate
... //depot/projects/smpng/sys/dev/mii/miidevs#5 integrate
... //depot/projects/smpng/sys/dev/mii/miidevs.h#5 integrate
... //depot/projects/smpng/sys/dev/mii/rlphy.c#5 integrate
... //depot/projects/smpng/sys/dev/null/null.c#5 integrate
... //depot/projects/smpng/sys/dev/pccard/pccarddevs#13 integrate
... //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#13 integrate
... //depot/projects/smpng/sys/dev/ppbus/if_plip.c#2 integrate
... //depot/projects/smpng/sys/dev/ppbus/lpbb.c#3 integrate
... //depot/projects/smpng/sys/dev/ppbus/lpt.c#3 integrate
... //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#3 integrate
... //depot/projects/smpng/sys/dev/ppbus/ppi.c#3 integrate
... //depot/projects/smpng/sys/dev/ppbus/pps.c#5 integrate
... //depot/projects/smpng/sys/dev/ppbus/vpo.c#2 integrate
... //depot/projects/smpng/sys/dev/syscons/syscons.c#17 integrate
... //depot/projects/smpng/sys/dev/usb/hid.c#3 integrate
... //depot/projects/smpng/sys/dev/usb/if_aue.c#12 integrate
... //depot/projects/smpng/sys/dev/usb/if_auereg.h#3 integrate
... //depot/projects/smpng/sys/dev/usb/if_cue.c#7 integrate
... //depot/projects/smpng/sys/dev/usb/if_cuereg.h#2 integrate
... //depot/projects/smpng/sys/dev/usb/if_kue.c#7 integrate
... //depot/projects/smpng/sys/dev/usb/if_kuereg.h#2 integrate
... //depot/projects/smpng/sys/dev/usb/ohci.c#14 integrate
... //depot/projects/smpng/sys/dev/usb/ohcivar.h#6 integrate
... //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#1 branch
... //depot/projects/smpng/sys/dev/usb/uhci.c#16 integrate
... //depot/projects/smpng/sys/dev/usb/uhcireg.h#4 integrate
... //depot/projects/smpng/sys/dev/usb/uhcivar.h#6 integrate
... //depot/projects/smpng/sys/dev/usb/uhid.c#8 integrate
... //depot/projects/smpng/sys/dev/usb/uhub.c#8 integrate
... //depot/projects/smpng/sys/dev/usb/ukbd.c#7 integrate
... //depot/projects/smpng/sys/dev/usb/ums.c#8 integrate
... //depot/projects/smpng/sys/dev/usb/usb.c#12 integrate
... //depot/projects/smpng/sys/dev/usb/usb_port.h#10 integrate
... //depot/projects/smpng/sys/dev/usb/usb_quirks.c#2 integrate
... //depot/projects/smpng/sys/dev/usb/usb_subr.c#9 integrate
... //depot/projects/smpng/sys/dev/usb/usbdevs#17 integrate
... //depot/projects/smpng/sys/dev/usb/usbdevs.h#18 integrate
... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#18 integrate
... //depot/projects/smpng/sys/dev/usb/usbdi.c#9 integrate
... //depot/projects/smpng/sys/dev/usb/usbdi.h#7 integrate
... //depot/projects/smpng/sys/dev/usb/usbdi_util.c#4 integrate
... //depot/projects/smpng/sys/dev/usb/usbdi_util.h#3 integrate
... //depot/projects/smpng/sys/dev/usb/usbdivar.h#9 integrate
... //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#2 integrate
... //depot/projects/smpng/sys/dev/wi/if_wireg.h#12 integrate
... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#9 integrate
... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#8 integrate
... //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#9 integrate
... //depot/projects/smpng/sys/fs/unionfs/union_subr.c#8 integrate
... //depot/projects/smpng/sys/geom/geom_dev.c#4 integrate
... //depot/projects/smpng/sys/geom/geom_disk.c#5 integrate
... //depot/projects/smpng/sys/i386/i386/machdep.c#34 integrate
... //depot/projects/smpng/sys/i386/isa/icu.h#5 integrate
... //depot/projects/smpng/sys/i386/isa/icu_ipl.s#2 integrate
... //depot/projects/smpng/sys/i386/isa/icu_vector.s#11 integrate
... //depot/projects/smpng/sys/i386/isa/intr_machdep.h#9 integrate
... //depot/projects/smpng/sys/ia64/conf/GENERIC#14 integrate
... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#9 integrate
... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#3 integrate
... //depot/projects/smpng/sys/ia64/include/param.h#4 integrate
... //depot/projects/smpng/sys/kern/kern_ktr.c#13 integrate
... //depot/projects/smpng/sys/kern/kern_proc.c#24 integrate
... //depot/projects/smpng/sys/kern/kern_shutdown.c#22 integrate
... //depot/projects/smpng/sys/kern/subr_diskslice.c#8 integrate
... //depot/projects/smpng/sys/kern/uipc_socket.c#18 integrate
... //depot/projects/smpng/sys/kern/vfs_aio.c#18 integrate
... //depot/projects/smpng/sys/kern/vfs_cache.c#10 integrate
... //depot/projects/smpng/sys/kern/vfs_syscalls.c#34 integrate
... //depot/projects/smpng/sys/netinet/if_fddi.h#3 delete
... //depot/projects/smpng/sys/netinet6/nd6.c#6 integrate
... //depot/projects/smpng/sys/pc98/i386/machdep.c#30 integrate
... //depot/projects/smpng/sys/pc98/pc98/fd.c#10 integrate
... //depot/projects/smpng/sys/pc98/pc98/sio.c#18 integrate
... //depot/projects/smpng/sys/pc98/pc98/syscons.c#14 integrate
... //depot/projects/smpng/sys/pci/if_rl.c#9 integrate
... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#21 integrate
... //depot/projects/smpng/sys/sparc64/conf/GENERIC#9 integrate
... //depot/projects/smpng/sys/sparc64/include/ktr.h#4 integrate
... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#19 integrate
... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#24 integrate
... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#20 integrate
... //depot/projects/smpng/sys/sys/ata.h#10 integrate
... //depot/projects/smpng/sys/sys/cdefs.h#11 integrate
... //depot/projects/smpng/sys/sys/disk.h#5 integrate
... //depot/projects/smpng/sys/sys/disklabel.h#14 integrate
... //depot/projects/smpng/sys/sys/malloc.h#6 integrate
... //depot/projects/smpng/sys/sys/socketvar.h#16 integrate
... //depot/projects/smpng/sys/sys/types.h#11 integrate
... //depot/projects/smpng/sys/sys/ucred.h#15 integrate
... //depot/projects/smpng/sys/sys/user.h#10 integrate
... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#22 integrate
... //depot/projects/smpng/sys/vm/uma.h#3 integrate
... //depot/projects/smpng/sys/vm/uma_core.c#7 integrate
... //depot/projects/smpng/sys/vm/uma_int.h#5 integrate
... //depot/projects/smpng/sys/vm/vm_zone.c#8 delete
... //depot/projects/smpng/sys/vm/vm_zone.h#4 delete

Differences ...

==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#39 (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/alpha/machdep.c,v 1.174 2002/04/05 00:52:15 alc Exp $
+ * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.175 2002/04/07 21:01:34 phk Exp $
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -190,7 +190,6 @@
 struct msgbuf *msgbufp=0;
 
 int Maxmem = 0;
-long dumplo;
 
 int	totalphysmem;		/* total amount of physical memory in system */
 int	physmem;		/* physical memory used by NetBSD + some rsvd */

==== //depot/projects/smpng/sys/boot/common/load_elf.c#3 (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/boot/common/load_elf.c,v 1.21 2001/09/11 01:09:19 peter Exp $
+ * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.22 2002/04/06 04:09:42 peter Exp $
  */
 
 #include <sys/param.h>
@@ -48,11 +48,11 @@
     Elf_Phdr 	*ph;
     Elf_Ehdr	*ehdr;
     Elf_Sym	*symtab;
-    Elf_Off	*hashtab;
-    Elf_Off	nbuckets;
-    Elf_Off	nchains;
-    Elf_Off*	buckets;
-    Elf_Off*	chains;
+    Elf_Hashelt	*hashtab;
+    Elf_Hashelt	nbuckets;
+    Elf_Hashelt	nchains;
+    Elf_Hashelt	*buckets;
+    Elf_Hashelt	*chains;
     char	*strtab;
     size_t	strsz;
     int		fd;
@@ -481,7 +481,7 @@
 	    break;
 	switch (dp[i].d_tag) {
 	case DT_HASH:
-	    ef->hashtab = (Elf_Off*)(dp[i].d_un.d_ptr + off);
+	    ef->hashtab = (Elf_Hashelt*)(dp[i].d_un.d_ptr + off);
 	    break;
 	case DT_STRTAB:
 	    ef->strtab = (char *)(dp[i].d_un.d_ptr + off);

==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#3 (text+ko) ====

@@ -1,9 +1,4 @@
-# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.3 2002/03/19 10:51:57 peter Exp $
+# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $
 
 # Options used when building app-specific efi components
-
-DPADD+=		${DESTDIR}/${LIBDIR}/libstand.a
-LIBSTANDDIR=	${.CURDIR}/../../../../lib/libstand
-LIBSTAND=	-lstand
-LIBEFI=		${.OBJDIR}/../libefi/libefi.a
 CFLAGS+=	-ffreestanding

==== //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.5 2001/10/25 08:50:14 dfr Exp $ */
+/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.6 2002/04/06 03:39:22 peter Exp $ */
 OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start_plabel)
@@ -22,9 +22,10 @@
   . = ALIGN(4096);
   .data :
   {
-    *(.rodata)
-    *(.rodata1)
-    *(.set.*)
+    *(.rodata*)
+    __start_set_Xcommand_set = .;
+    *(set_Xcommand_set)
+    __stop_set_Xcommand_set = .;
     *(.ctors)
     *(.data)
     *(.data1)

==== //depot/projects/smpng/sys/boot/efi/loader/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.11 2002/04/04 06:04:38 peter Exp $
+# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.17 2002/04/07 04:27:50 peter Exp $
 
 .PATH: ${.CURDIR}/../common
 
@@ -6,6 +6,8 @@
 PROG= 		${BASE}.efi
 NOMAN=
 NEWVERSWHAT=	"EFI boot" ${MACHINE_ARCH}
+BINDIR?=	/boot
+STRIP=		# We must not strip loader.efi at install time.
 
 SRCS+=		main.c conf.c dev_net.c
 
@@ -23,6 +25,19 @@
 LIBFICL=
 .endif
 
+# where to get libstand from
+.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a)
+LIBSTAND=	${.OBJDIR}/../../../../lib/libstand/libstand.a
+.else
+LIBSTAND=	${.CURDIR}/../../../../lib/libstand/libstand.a
+.endif
+
+.if exists(${.OBJDIR}/../libefi/libefi.a)
+LIBEFI=		${.OBJDIR}/../libefi/libefi.a
+.else
+LIBEFI=		${.CURDIR}/../libefi/libefi.a
+.endif
+
 # Always add MI sources 
 .PATH: ${.CURDIR}/../../common
 .include <${.CURDIR}/../../common/Makefile.inc>
@@ -38,6 +53,7 @@
 
 LDSCRIPT=	${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH}
 LDFLAGS=	-nostdlib -T ${LDSCRIPT} -shared -Bsymbolic
+OBJCOPY?=	objcopy
 
 CLEANFILES+=	setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \
 		vers.c vers.o ${BASE}.efi ${BASE}.sym ${BASE}.list
@@ -46,15 +62,16 @@
 
 CRT=	start.o
 
-all: ${PROG}
+all: ${BASE}
 
 vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
 	${CC} -c vers.c
 
+${BASE}:	${BASE}.efi ${BASE}.help
+
 ${BASE}.efi: ${BASE}.sym
 	${OBJCOPY} -j .text \
-		-j set_Xcommand_set \
 		-j .hash \
 		-j .data \
 		-j .sdata \
@@ -66,16 +83,30 @@
 		--target=efi-app-${MACHINE_ARCH} \
 		${BASE}.sym ${BASE}.efi
 
-${BASE}.help:	help.common help.efi
+${BASE}.help:	help.common
 	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
 	    > ${.TARGET}
 
 beforeinstall:
-.if exists(${.OBJDIR}/${BASE}.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
+.if !exists(${DESTDIR}/boot/loader.rc)
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot
+		${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot
 .endif
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults
 
+
 # Other fragments still to be brought in from ../Makfile.booters?
 start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S
 	${CC} -c ${CFLAGS} ${.IMPSRC}
@@ -85,9 +116,8 @@
 
 .include <bsd.prog.mk>
 
-${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o
+${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o
 	${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \
-	    ${LIBFICL}  ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \
-	    > ${.OBJDIR}/${BASE}.list
+	    ${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list
 
 beforedepend ${OBJS}: machine

==== //depot/projects/smpng/sys/boot/ia64/libski/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.3 2002/03/19 10:51:57 peter Exp $
+# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.4 2002/04/06 04:33:53 peter Exp $
 
 LIB=		ski
 NOPIC=		true
@@ -15,7 +15,6 @@
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 CFLAGS+=	-I${.CURDIR}/../../efi/include
 CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
-CFLAGS+=	-ffreestanding
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.

==== //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#5 (text+ko) ====

@@ -1,17 +1,18 @@
-# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.5 2002/03/29 22:53:56 marcel Exp $
+# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.8 2002/04/07 04:26:42 peter Exp $
 
 .PATH: ${.CURDIR}/../common
 
 PROG= 		skiload
 NOMAN=
 NEWVERSWHAT=	"ia64 SKI boot" ${MACHINE_ARCH}
+BINDIR?=	/boot
 
 SRCS+=		main.c conf.c
 
 # Enable BootForth
 BOOT_FORTH=	yes
 CFLAGS+=	-g
-CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha
+CFLAGS+=	-I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64
 .if BOOT_FORTH
 CFLAGS+=	-DBOOT_FORTH
 .if exists(${.OBJDIR}/../../ficl/libficl.a)
@@ -24,13 +25,10 @@
 .endif
 
 # where to get libstand from
-#XXX need a better way to do this
+.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a)
+LIBSTAND=       ${.OBJDIR}/../../../../lib/libstand/libstand.a
+.else
 LIBSTAND=       ${.CURDIR}/../../../../lib/libstand/libstand.a
-.if !exists(${LIBSTAND})
-LIBSTAND=       ${.OBJDIR}/../../../../lib/libstand/libstand.a
-.if !exists(${LIBSTAND})
-LIBSTAND=       -lstand
-.endif
 .endif
 
 .if exists(${.OBJDIR}/../libski/libski.a)
@@ -50,7 +48,6 @@
 CFLAGS+= -I${.CURDIR}/../../.. -I.
 CFLAGS+= -I${.CURDIR}/../libski
 CFLAGS+= -DLOADER
-CFLAGS+= -ffreestanding
 
 LDFLAGS=	-nostdlib -T ${.CURDIR}/ldscript.ia64
 
@@ -74,14 +71,10 @@
 	    ${.OBJDIR}/${PROG}.help ${DESTDIR}/boot
 .endif
 
-# Other fragments still to be brought in from ../Makfile.booters?
-start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S
-	${CC} -c ${CFLAGS} ${.IMPSRC}
-
 machine:
 	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
-${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o
+${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} ${LIBSTAND} vers.o
 	${LD} ${LDFLAGS} -o ${PROG} -M \
 	    ${OBJS} vers.o \
 	    ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \

==== //depot/projects/smpng/sys/conf/Makefile.ia64#17 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.ia64 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.48 2002/03/24 17:45:46 obrien Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.49 2002/04/07 04:34:21 peter Exp $
 #
 # Makefile for FreeBSD
 #
@@ -20,13 +20,6 @@
 CWARNFLAGS=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
 		-Wno-format -ffreestanding
-CC=		ia64-unknown-freebsd5.0-gcc
-LD=		ia64-unknown-freebsd5.0-ld
-NM=		ia64-unknown-freebsd5.0-nm
-SIZE=		ia64-unknown-freebsd5.0-size
-OBJCOPY=	ia64-unknown-freebsd5.0-objcopy
-OBJDUMP=	ia64-unknown-freebsd5.0-objdump
-MACHINE_ARCH=	ia64
 
 # Which version of config(8) is required.
 %VERSREQ=	500010

==== //depot/projects/smpng/sys/conf/files.pc98#22 (text+ko) ====

@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-# $FreeBSD: src/sys/conf/files.pc98,v 1.228 2002/03/27 05:39:16 dillon Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.229 2002/04/06 06:41:54 nyan Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -190,6 +190,7 @@
 i386/i386/elf_machdep.c		standard
 i386/i386/exception.s		standard
 i386/i386/i386-gdbstub.c	optional	ddb
+i386/i386/i386dump.c		standard
 i386/i386/i686_mem.c		standard
 i386/i386/identcpu.c		standard
 i386/i386/in_cksum.c		optional	inet

==== //depot/projects/smpng/sys/dev/aac/aac_pci.c#12 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.19 2002/04/02 21:49:26 scottl Exp $
+ *	$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.20 2002/04/05 20:00:29 scottl Exp $
  */
 
 /*
@@ -101,6 +101,7 @@
 	{0x1028, 0x0008, 0x1028, 0x00cf, AAC_HWIF_I960RX, "Dell PERC 3/Di"},
 	{0x1028, 0x000a, 0x1028, 0x0106, AAC_HWIF_I960RX, "Dell PERC 3/Di"},
 	{0x1028, 0x000a, 0x1028, 0x011b, AAC_HWIF_I960RX, "Dell PERC 3/Di"},
+	{0x1028, 0x000a, 0x1028, 0x0121, AAC_HWIF_I960RX, "Dell PERC 3/Di"},
 	{0x1011, 0x0046, 0x9005, 0x0364, AAC_HWIF_STRONGARM, "Adaptec AAC-364"},
 	{0x1011, 0x0046, 0x9005, 0x0365, AAC_HWIF_STRONGARM,
 	 "Adaptec SCSI RAID 5400S"},

==== //depot/projects/smpng/sys/dev/acpica/acpi.c#24 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.57 2002/04/04 21:03:13 jhb Exp $
+ *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.58 2002/04/08 06:58:17 takawata Exp $
  */
 
 #include "opt_acpi.h"
@@ -556,6 +556,7 @@
     retval += acpi_print_resources(rl, "port",  SYS_RES_IOPORT, "%#lx");
     retval += acpi_print_resources(rl, "iomem", SYS_RES_MEMORY, "%#lx");
     retval += acpi_print_resources(rl, "irq",   SYS_RES_IRQ,    "%ld");
+    retval += acpi_print_resources(rl, "drq",   SYS_RES_DRQ,    "%ld");
     retval += bus_print_child_footer(bus, child);
 
     return(retval);

==== //depot/projects/smpng/sys/dev/ata/ata-all.c#18 (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.146 2002/04/05 15:58:45 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.148 2002/04/05 18:37:04 sos Exp $
  */
 
 #include "opt_ata.h"
@@ -215,7 +215,8 @@
     struct ata_channel *ch;
     int s;
  
-    if (!dev || !(ch = device_get_softc(dev)))
+    if (!dev || !(ch = device_get_softc(dev)) ||
+	!ch->r_io || !ch->r_altio || !ch->r_irq)
 	return ENXIO;
 
     /* make sure channel is not busy */
@@ -302,7 +303,8 @@
 	    if (!device || !(ch = device_get_softc(device)))
 		return ENXIO;
 	    ATA_SLEEPLOCK_CH(ch, ATA_ACTIVE);
-	    error = ata_reinit(ch);
+	    if ((error = ata_reinit(ch)))
+		ATA_UNLOCK_CH(ch);
 	    return error;
 
 	case ATAGMODE:
@@ -837,6 +839,7 @@
 
     if (!ch->r_io || !ch->r_altio || !ch->r_irq)
 	return ENXIO;
+
     ATA_FORCELOCK_CH(ch, ATA_CONTROL);
     ch->running = NULL;
     devices = ch->devices;

==== //depot/projects/smpng/sys/dev/ata/ata-disk.c#17 (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-disk.c,v 1.130 2002/04/05 13:13:55 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.131 2002/04/05 18:04:05 sos Exp $
  */
 
 #include "opt_ata.h"
@@ -125,8 +125,8 @@
     adp->total_secs = atadev->param->cylinders * adp->heads * adp->sectors;	
     bioq_init(&adp->queue);
 
-    lbasize = (u_int32_t)atadev->param->lba_size_lo |
-	((u_int32_t)atadev->param->lba_size_hi << 16);
+    lbasize = (u_int32_t)atadev->param->lba_size_1 |
+	       ((u_int32_t)atadev->param->lba_size_2 << 16);
 
     /* does this device need oldstyle CHS addressing */
     if (!ad_version(atadev->param->version_major) || 
@@ -137,10 +137,10 @@
     if (atadev->param->cylinders == 16383 && adp->total_secs < lbasize)
 	adp->total_secs = lbasize;
 
-    lbasize48 = (u_int64_t)atadev->param->lba_size48_1 |
-	((u_int64_t)atadev->param->lba_size48_2 << 16) |
-	((u_int64_t)atadev->param->lba_size48_3 << 32) |
-	((u_int64_t)atadev->param->lba_size48_4 << 48);
+    lbasize48 = ((u_int64_t)atadev->param->lba_size48_1) |
+		((u_int64_t)atadev->param->lba_size48_2 << 16) |
+		((u_int64_t)atadev->param->lba_size48_3 << 32) |
+		((u_int64_t)atadev->param->lba_size48_4 << 48);
 
     /* use the 48bit LBA size if valid */
     if (atadev->param->support.address48 && lbasize48 > 268435455)

==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#18 (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.93 2002/04/05 13:13:55 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.94 2002/04/07 07:53:34 sos Exp $
  */
 
 #include <sys/param.h>
@@ -969,6 +969,7 @@
 	break;
 
     case 0x4d69105a:	/* Promise TX2 ATA133 controllers */
+    case 0x5275105a:	/* Promise TX2 ATA133 controllers */
 	ATA_OUTB(atadev->channel->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
 	if (udmamode >= 6 &&
 	    !(ATA_INB(atadev->channel->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) {

==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#18 (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.37 2002/04/05 13:13:55 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.39 2002/04/07 07:53:34 sos Exp $
  */
 
 #include "opt_ata.h"
@@ -269,6 +269,7 @@
 	return "Promise TX2 ATA100 controller";
 
     case 0x4d69105a:
+    case 0x5275105a:
 	return "Promise TX2 ATA133 controller";
 
     case 0x00041103:
@@ -371,7 +372,7 @@
 	return 0;
     }
 
-#ifdef ATA_ENABLE_BUSMASTER
+#ifdef __sparc64__
     if (!(cmd & PCIM_CMD_BUSMASTEREN)) {
 	pci_write_config(dev, PCIR_COMMAND, cmd | PCIM_CMD_BUSMASTEREN, 2);
 	cmd = pci_read_config(dev, PCIR_COMMAND, 2);
@@ -570,6 +571,7 @@
     case 0x4d68105a:	/* Promise TX2 ATA100 */
     case 0x6268105a:	/* Promise TX2 ATA100 */
     case 0x4d69105a:	/* Promise TX2 ATA133 */
+    case 0x5275105a:	/* Promise TX2 ATA133 */
 	ATA_OUTB(ch->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
 	if (!(ATA_INB(ch->r_bmio, ATA_BMDEVSPEC_1) & 0x20))
 	    return 1;

==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#22 (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.117 2002/04/05 13:13:55 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.118 2002/04/05 18:04:05 sos Exp $
  */
 
 #include "opt_ata.h"
@@ -255,22 +255,17 @@
     return cdp;
 }
 
-/*
- * Handle dev_clone events, so that acd can be used as root device.
- */
 static void
 acd_clone(void *arg, char *name, int namelen, dev_t *dev)
 {
-    struct acd_softc *cdp;
+    struct acd_softc *cdp = arg;
     char *p;
     int unit;
 
-    cdp = arg;
     if (*dev != NODEV)
 	return;
     if (!dev_stdclone(name, &p, "acd", &unit))
 	return;
-    /* Handle compatability slices. */
     if (*p != '\0' && strcmp(p, "a") != 0 && strcmp(p, "c") != 0)
 	return;
     if (unit == cdp->lun)

==== //depot/projects/smpng/sys/dev/ccd/ccd.c#13 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.102 2002/04/02 11:52:08 phk Exp $ */
+/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.103 2002/04/08 09:20:06 phk Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -98,7 +98,7 @@
 #include <sys/conf.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
-#include <sys/disklabel.h>
+#include <sys/disk.h>
 #include <ufs/ffs/fs.h> 
 #include <sys/devicestat.h>
 #include <sys/fcntl.h>

==== //depot/projects/smpng/sys/dev/em/if_em.c#5 (text+ko) ====

@@ -1,6 +1,6 @@
 /**************************************************************************
 
-Copyright (c) 2001 Intel Corporation
+Copyright (c) 2001-2002 Intel Corporation
 All rights reserved.
 
 Redistribution and use in source and binary forms of the Software, with or
@@ -33,7 +33,7 @@
 
 ***************************************************************************/
 
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.4 2002/03/20 02:07:19 alfred Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.5 2002/04/06 00:36:53 pdeuskar Exp $*/
 
 #include <dev/em/if_em.h>
 
@@ -53,7 +53,7 @@
  *  Driver version
  *********************************************************************/
 
-char em_driver_version[] = "1.1.10";
+char em_driver_version[] = "1.2.7";
 
 
 /*********************************************************************
@@ -75,6 +75,7 @@
     { 0x8086, 0x1009, PCI_ANY_ID, PCI_ANY_ID, 0 },
     { 0x8086, 0x100C, PCI_ANY_ID, PCI_ANY_ID, 0 },
     { 0x8086, 0x100D, PCI_ANY_ID, PCI_ANY_ID, 0 },
+    { 0x8086, 0x100E, PCI_ANY_ID, PCI_ANY_ID, 0 },
     /* required last entry */
     { 0, 0, 0, 0, 0}
 };
@@ -91,52 +92,53 @@
 /*********************************************************************
  *  Function prototypes            
  *********************************************************************/
-static int em_probe(device_t);
-static int em_attach(device_t);
-static int em_detach(device_t);
-static int em_shutdown(device_t);
+static int  em_probe(device_t);
+static int  em_attach(device_t);
+static int  em_detach(device_t);
+static int  em_shutdown(device_t);
 static void em_intr(void *);
 static void em_start(struct ifnet *);
-static int em_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t);
+static int  em_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t);
 static void em_watchdog(struct ifnet *);
 static void em_init(void *);
 static void em_stop(void *);
 static void em_media_status(struct ifnet *, struct ifmediareq *);
-static int em_media_change(struct ifnet *);
+static int  em_media_change(struct ifnet *);
 static void em_identify_hardware(struct adapter *);
-static int em_allocate_pci_resources(struct adapter *);
+static int  em_allocate_pci_resources(struct adapter *);
 static void em_free_pci_resources(struct adapter *);
 static void em_local_timer(void *);
-static int em_hardware_init(struct adapter *);
+static int  em_hardware_init(struct adapter *);
 static void em_read_mac_address(struct adapter *, u_int8_t *);
 static void em_setup_interface(device_t, struct adapter *);
-static int em_setup_transmit_structures(struct adapter *);
+static int  em_setup_transmit_structures(struct adapter *);
 static void em_initialize_transmit_unit(struct adapter *);
-static int em_setup_receive_structures(struct adapter *);
+static int  em_setup_receive_structures(struct adapter *);
 static void em_initialize_receive_unit(struct adapter *);
-static void EnableInterrupts(struct adapter *);
-static void DisableInterrupts(struct adapter *);
+static void em_enable_intr(struct adapter *);
+static void em_disable_intr(struct adapter *);
 static void em_free_transmit_structures(struct adapter *);
 static void em_free_receive_structures(struct adapter *);
 static void em_update_stats_counters(struct adapter *);
 static void em_clean_transmit_interrupts(struct adapter *);
-static int em_allocate_receive_structures(struct adapter *);
-static int em_allocate_transmit_structures(struct adapter *);
+static int  em_allocate_receive_structures(struct adapter *);
+static int  em_allocate_transmit_structures(struct adapter *);
 static void em_process_receive_interrupts(struct adapter *);
 static void em_receive_checksum(struct adapter *, 
-                                     struct em_rx_desc * RxDescriptor,
-                                     struct mbuf *);
+                                struct em_rx_desc * rx_desc,
+                                struct mbuf *);
 static void em_transmit_checksum_setup(struct adapter *,
-                                            struct mbuf *,
-                                            struct em_tx_buffer *,
-                                            u_int32_t *,
-                                            u_int32_t *);
+                                       struct mbuf *,
+                                       struct em_tx_buffer *,
+                                       u_int32_t *,
+                                       u_int32_t *);
 static void em_set_promisc(struct adapter *);
 static void em_disable_promisc(struct adapter *);
 static void em_set_multi(struct adapter *);
 static void em_print_hw_stats(struct adapter *);
 static void em_print_link_status(struct adapter *);
-static int em_get_buf(struct em_rx_buffer *, struct adapter *, struct mbuf *);
+static int  em_get_buf(struct em_rx_buffer *, struct adapter *,
+                       struct mbuf *);
 /*********************************************************************
  *  FreeBSD Device Interface Entry Points                    
  *********************************************************************/
@@ -223,128 +225,128 @@
 static int
 em_attach(device_t dev)
 {
-   struct adapter * Adapter;
+   struct adapter * adapter;
    int             s;
    int             tsize, rsize;
 
    INIT_DEBUGOUT("em_attach: begin");
    s = splimp();
 
-   /* Allocate, clear, and link in our Adapter structure */
-   if (!(Adapter = device_get_softc(dev))) {
-      printf("em: Adapter structure allocation failed\n");
+   /* Allocate, clear, and link in our adapter structure */
+   if (!(adapter = device_get_softc(dev))) {
+      printf("em: adapter structure allocation failed\n");
       splx(s);
       return(ENOMEM);
    }
-   bzero(Adapter, sizeof(struct adapter ));
-   Adapter->dev = dev;
-   Adapter->osdep.dev = dev;
-   Adapter->unit = device_get_unit(dev);
+   bzero(adapter, sizeof(struct adapter ));
+   adapter->dev = dev;
+   adapter->osdep.dev = dev;
+   adapter->unit = device_get_unit(dev);
 
    if (em_adapter_list != NULL)
-      em_adapter_list->prev = Adapter;
-   Adapter->next = em_adapter_list;
-   em_adapter_list = Adapter;
+      em_adapter_list->prev = adapter;
+   adapter->next = em_adapter_list;
+   em_adapter_list = adapter;
 
-   callout_handle_init(&Adapter->timer_handle);
+   callout_handle_init(&adapter->timer_handle);
 
    /* Determine hardware revision */
-   em_identify_hardware(Adapter);
+   em_identify_hardware(adapter);
 
    /* Parameters (to be read from user) */
-   Adapter->NumTxDescriptors = MAX_TXD;
-   Adapter->NumRxDescriptors = MAX_RXD;
-   Adapter->TxIntDelay = TIDV;
-   Adapter->RxIntDelay = RIDV;
-   Adapter->shared.autoneg = DO_AUTO_NEG;
-   Adapter->shared.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT;
-   Adapter->shared.autoneg_advertised = AUTONEG_ADV_DEFAULT;
-   Adapter->shared.tbi_compatibility_en = TRUE;
-   Adapter->RxBufferLen = EM_RXBUFFER_2048;
-   Adapter->RxChecksum = EM_ENABLE_RXCSUM_OFFLOAD;
+   adapter->num_tx_desc = MAX_TXD;
+   adapter->num_rx_desc = MAX_RXD;
+   adapter->tx_int_delay = TIDV;
+   adapter->rx_int_delay = RIDV;
+   adapter->shared.autoneg = DO_AUTO_NEG;
+   adapter->shared.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT;
+   adapter->shared.autoneg_advertised = AUTONEG_ADV_DEFAULT;
+   adapter->shared.tbi_compatibility_en = TRUE;
+   adapter->rx_buffer_len = EM_RXBUFFER_2048;
+   adapter->rx_checksum = EM_ENABLE_RXCSUM_OFFLOAD;
    
-   Adapter->shared.fc_high_water = FC_DEFAULT_HI_THRESH;
-   Adapter->shared.fc_low_water  = FC_DEFAULT_LO_THRESH;
-   Adapter->shared.fc_pause_time = FC_DEFAULT_TX_TIMER;
-   Adapter->shared.fc_send_xon   = TRUE;
-   Adapter->shared.fc = em_fc_full;
+   adapter->shared.fc_high_water = FC_DEFAULT_HI_THRESH;
+   adapter->shared.fc_low_water  = FC_DEFAULT_LO_THRESH;
+   adapter->shared.fc_pause_time = FC_DEFAULT_TX_TIMER;
+   adapter->shared.fc_send_xon   = TRUE;
+   adapter->shared.fc = em_fc_full;
 
-
    /* Set the max frame size assuming standard ethernet sized frames */   
-   Adapter->shared.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN;
+   adapter->shared.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN;
+   adapter->shared.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN;
 
    /* This controls when hardware reports transmit completion status. */
    if ((EM_REPORT_TX_EARLY == 0) || (EM_REPORT_TX_EARLY == 1)) {
-      Adapter->shared.report_tx_early = EM_REPORT_TX_EARLY;
+      adapter->shared.report_tx_early = EM_REPORT_TX_EARLY;
    } else {
-      if(Adapter->shared.mac_type < em_82543) {
-         Adapter->shared.report_tx_early = 0;
+      if(adapter->shared.mac_type < em_82543) {
+         adapter->shared.report_tx_early = 0;
       } else {
-         Adapter->shared.report_tx_early = 1;
+         adapter->shared.report_tx_early = 1;
       }
    }
 
-   if (em_allocate_pci_resources(Adapter)) {
-      printf("em%d: Allocation of PCI resources failed\n", Adapter->unit);
-      em_free_pci_resources(Adapter);
+   if (em_allocate_pci_resources(adapter)) {
+      printf("em%d: Allocation of PCI resources failed\n", adapter->unit);
+      em_free_pci_resources(adapter);
       splx(s);
       return(ENXIO);
    }
 
-   tsize = EM_ROUNDUP(Adapter->NumTxDescriptors *
+   tsize = EM_ROUNDUP(adapter->num_tx_desc *
                       sizeof(struct em_tx_desc), 4096);
 
    /* Allocate Transmit Descriptor ring */
-   if (!(Adapter->TxDescBase = (struct em_tx_desc *)
+   if (!(adapter->tx_desc_base = (struct em_tx_desc *)
          contigmalloc(tsize, M_DEVBUF, M_NOWAIT, 0, ~0, PAGE_SIZE, 0))) {
-      printf("em%d: Unable to allocate TxDescriptor memory\n", Adapter->unit);
-      em_free_pci_resources(Adapter);
+      printf("em%d: Unable to allocate TxDescriptor memory\n", adapter->unit);
+      em_free_pci_resources(adapter);
       splx(s);
       return(ENOMEM);
    }
 
-   rsize = EM_ROUNDUP(Adapter->NumRxDescriptors *
+   rsize = EM_ROUNDUP(adapter->num_rx_desc *
                       sizeof(struct em_rx_desc), 4096);
 
    /* Allocate Receive Descriptor ring */
-   if (!(Adapter->RxDescBase = (struct em_rx_desc *)
+   if (!(adapter->rx_desc_base = (struct em_rx_desc *)
         contigmalloc(rsize, M_DEVBUF, M_NOWAIT, 0, ~0, PAGE_SIZE, 0))) {
-      printf("em%d: Unable to allocate RxDescriptor memory\n", Adapter->unit);
-      em_free_pci_resources(Adapter);
-      contigfree(Adapter->TxDescBase, tsize, M_DEVBUF);
+      printf("em%d: Unable to allocate rx_desc memory\n", adapter->unit);
+      em_free_pci_resources(adapter);
+      contigfree(adapter->tx_desc_base, tsize, M_DEVBUF);
       splx(s);
       return(ENOMEM);
    }
 
    /* Initialize the hardware */
-   if (em_hardware_init(Adapter)) {
-      printf("em%d: Unable to initialize the hardware\n",Adapter->unit);
-      em_free_pci_resources(Adapter);
-      contigfree(Adapter->TxDescBase, tsize, M_DEVBUF);
-      contigfree(Adapter->RxDescBase, rsize, M_DEVBUF);
+   if (em_hardware_init(adapter)) {
+      printf("em%d: Unable to initialize the hardware\n",adapter->unit);
+      em_free_pci_resources(adapter);
+      contigfree(adapter->tx_desc_base, tsize, M_DEVBUF);
+      contigfree(adapter->rx_desc_base, rsize, M_DEVBUF);
       splx(s);
       return(EIO);
    }
 
    /* Setup OS specific network interface */
-   em_setup_interface(dev, Adapter);
+   em_setup_interface(dev, adapter);
 
    /* Initialize statistics */
-   em_clear_hw_cntrs(&Adapter->shared);
-   em_update_stats_counters(Adapter);
-   Adapter->shared.get_link_status = 1;
-   em_check_for_link(&Adapter->shared);
+   em_clear_hw_cntrs(&adapter->shared);
+   em_update_stats_counters(adapter);
+   adapter->shared.get_link_status = 1;
+   em_check_for_link(&adapter->shared);
 
    /* Print the link status */
-   if (Adapter->LinkIsActive == 1) {
-      em_get_speed_and_duplex(&Adapter->shared, &Adapter->LineSpeed, &Adapter->FullDuplex);
+   if (adapter->link_active == 1) {
+      em_get_speed_and_duplex(&adapter->shared, &adapter->link_speed, &adapter->link_duplex);
       printf("em%d:  Speed:%d Mbps  Duplex:%s\n",
-             Adapter->unit,
-             Adapter->LineSpeed,
-             Adapter->FullDuplex == FULL_DUPLEX ? "Full" : "Half");
+             adapter->unit,
+             adapter->link_speed,
+             adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half");
    }
    else
-      printf("em%d:  Speed:N/A  Duplex:N/A\n", Adapter->unit);
+      printf("em%d:  Speed:N/A  Duplex:N/A\n", adapter->unit);
 
 
    INIT_DEBUGOUT("em_attach: end");
@@ -365,44 +367,44 @@
 static int
 em_detach(device_t dev)
 {

>>> 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?200204081958.g38JwKf25432>