--- a/ChangeLog	Sat Jun 07 15:17:48 2008 +0000
+++ b/ChangeLog	Sat Jun 07 20:01:38 2008 +0000
@@ -1,3 +1,11 @@
+2008-06-06  Albert Lee  <[email protected]>
+
+	* SFEnicdrv.spec: Use driver version numbers in SFEnicdrv-* packages.
+	  Update to vel-2.6.0, sige-2.6.2, myk-2.6.0. Add nfo driver
+	* patches/nicdrv-05-myk.diff: Update for myk-2.6.0
+	* patches/nicdrv-08-alta.diff: Drop, replaced by patch8
+	* patches/nicdrv-08-gldv3.diff: Patch GEM 2.6 header for compatibility
+
 2008-06-06  Albert Lee  <[email protected]>
 
 	* SFEswftools.spec: *NEW* SWF manipulation and generation utilities

--- a/SFEnicdrv.spec	Sat Jun 07 15:17:48 2008 +0000
+++ b/SFEnicdrv.spec	Sat Jun 07 20:01:38 2008 +0000
@@ -12,38 +12,65 @@
 %include arch64.inc
 %endif
 
+%define vfe_version 2.6.2a
+%define rf_version 2.4.0
+%define ni_version 0.8.11
+%define alta_version 2.6.0
+%define tu_version 2.6.0b
+%define bfe_version 2.6.0a
+%define tne_version 2.4.0a
+%define ife_version 2.6.0a
+%define epfe_version 2.4.0
+%define mtd_version 2.4.0
+%define ae_version 2.6.0a
+%define tcfe_version 2.4.0
+%define gani_version 2.4.4
+%define vel_version 2.6.0
+%define nfo_version 2.6.0
+%define icpt_version 2.4.0
+%define sige_version 2.6.2
+%define em_version 2.4.0
+%define myk_version 2.6.0
+%define urf_version 0.8.2
+%define axf_version 0.8.2
+%define upf_version 0.8.2
+
+%define src_url http://homepage2.nifty.com/mrym3/taiyodo
+
 Name:                SFEnicdrv
 Summary:             Base package for Masayuki Murayama's Solaris NIC drivers
 Version:             1.0
-Source0:             http://homepage2.nifty.com/mrym3/taiyodo/vfe-2.6.2a.tar.gz
-Source1:             http://homepage2.nifty.com/mrym3/taiyodo/rf-2.4.0.tar.gz
-Source2:             http://homepage2.nifty.com/mrym3/taiyodo/ni-0.8.11.tar.gz
-Source3:             http://homepage2.nifty.com/mrym3/taiyodo/alta-2.6.0.tar.gz
+Source0:             %{src_url}/vfe-%{vfe_version}.tar.gz
+Source1:             %{src_url}/rf-%{rf_version}.tar.gz
+Source2:             %{src_url}/ni-%{ni_version}.tar.gz
+Source3:             %{src_url}/alta-%{alta_version}.tar.gz
 
 # Replaces dnet which is still missing on sparc
 # dnet had a number of other updates since this was written, though
-Source4:             http://homepage2.nifty.com/mrym3/taiyodo/tu-2.6.0b.tar.gz
-Source5:             http://homepage2.nifty.com/mrym3/taiyodo/bfe-2.6.0a.tar.gz
-Source6:             http://homepage2.nifty.com/mrym3/taiyodo/tne-2.4.0a.tar.gz
+Source4:             %{src_url}/tu-%{tu_version}.tar.gz
+Source5:             %{src_url}/bfe-%{bfe_version}.tar.gz
+Source6:             %{src_url}/tne-%{tne_version}.tar.gz
 # Replaces spwr
-Source7:             http://homepage2.nifty.com/mrym3/taiyodo/epfe-2.4.0.tar.gz
-Source8:             http://homepage2.nifty.com/mrym3/taiyodo/mtd-2.4.0.tar.gz
+Source7:             %{src_url}/epfe-%{epfe_version}.tar.gz
+Source8:             %{src_url}/mtd-%{mtd_version}.tar.gz
 # Replaces pcn
-Source9:             http://homepage2.nifty.com/mrym3/taiyodo/ae-2.6.0a.tar.gz
-Source10:            http://homepage2.nifty.com/mrym3/taiyodo/gani-2.4.4.tar.gz
-Source11:            http://homepage2.nifty.com/mrym3/taiyodo/vel-2.4.0.tar.gz
-Source12:            http://homepage2.nifty.com/mrym3/taiyodo/icpt-2.4.0.tar.gz
-Source13:            http://homepage2.nifty.com/mrym3/taiyodo/sige-2.6.0.tar.gz
-Source14:            http://homepage2.nifty.com/mrym3/taiyodo/myk-2.5.0.tar.gz
-Source15:            http://homepage2.nifty.com/mrym3/taiyodo/urf-0.8.2.tar.gz
-Source16:            http://homepage2.nifty.com/mrym3/taiyodo/axf-0.8.2.tar.gz
-Source17:            http://homepage2.nifty.com/mrym3/taiyodo/upf-0.8.2.tar.gz
+Source9:             %{src_url}/ae-%{ae_version}.tar.gz
+Source10:            %{src_url}/gani-%{gani_version}.tar.gz
+Source11:            %{src_url}/vel-%{vel_version}.tar.gz
+Source12:            %{src_url}/icpt-%{icpt_version}.tar.gz
+Source13:            %{src_url}/sige-%{sige_version}.tar.gz
+Source14:            %{src_url}/myk-%{myk_version}.tar.gz
+Source15:            %{src_url}/urf-%{urf_version}.tar.gz
+Source16:            %{src_url}/axf-%{axf_version}.tar.gz
+Source17:            %{src_url}/upf-%{upf_version}.tar.gz
 # Replaces iprb
-Source18:            http://homepage2.nifty.com/mrym3/taiyodo/ife-2.6.0a.tar.gz
+Source18:            %{src_url}/ife-%{ife_version}.tar.gz
 # Replaces elxl
-Source19:            http://homepage2.nifty.com/mrym3/taiyodo/tcfe-2.4.0.tar.gz
+Source19:            %{src_url}/tcfe-%{tcfe_version}.tar.gz
 # Replaces e1000g
-Source20:            http://homepage2.nifty.com/mrym3/taiyodo/em-2.4.0.tar.gz
+Source20:            %{src_url}/em-%{em_version}.tar.gz
+# Replaces nge and supports newer nForce chipsets
+Source21:            %{src_url}/nfo-%{nfo_version}.tar.gz
 
 # Template script used to generate post-install scripts for each driver.
 Source100:           drvtestadd
@@ -59,7 +86,7 @@
 Source103:           etc_system
 
 # Headers for building GLDv3 drivers outside of ON tree.
-Source104:           http://trisk.acm.jhu.edu/gldv3-headers-0.1.tar.bz2
+Source104:           http://trisk.acm.jhu.edu/src/gldv3-headers-0.2.tar.bz2
 Patch1:              nicdrv-01-em.diff
 Patch2:              nicdrv-02-rf.diff
 Patch3:              nicdrv-03-tu.diff
@@ -67,7 +94,7 @@
 Patch5:              nicdrv-05-myk.diff
 Patch6:              nicdrv-06-ife.diff
 Patch7:              nicdrv-07-tcfe.diff
-Patch8:              nicdrv-08-alta.diff
+Patch8:              nicdrv-08-gldv3.diff
 
 URL:                 http://homepage2.nifty.com/mrym3/taiyodo/eng/
 SUNW_BaseDir:        /
@@ -75,7 +102,8 @@
 %include default-depend.inc
 
 %package vfe
-Summary:       Nic driver for VIA Rhine family fast ethernet chipset 
+Summary:       NIC driver for VIA Rhine family fast ethernet chipset 
+Version:       %{vfe_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -84,7 +112,8 @@
 Requires: SUNWcnetr
 
 %package rf
-Summary:       Nic driver for Realtek RTL 8129 / 8139 / 810x family fast ethernet chipset
+Summary:       NIC driver for Realtek RTL 8129 / 8139 / 810x family fast ethernet chipset
+Version:       %{rf_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -93,7 +122,8 @@
 Requires: SUNWcnetr
 
 %package ni
-Summary:       Nic (ni/pcni) driver for NE2000 compatible PCI/PCMCIA/PnP ISA ethernet cards
+Summary:       NIC (ni/pcni) driver for NE2000 compatible PCI/PCMCIA/PnP ISA ethernet cards
+Version:       %{ni_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -102,7 +132,8 @@
 Requires: SUNWcnetr
 
 %package alta
-Summary:       Nic driver for Sundance Technology ST201, IC Plus IP100A fast ethernet chipset
+Summary:       NIC driver for Sundance Technology ST201, IC Plus IP100A fast ethernet chipset
+Version:       %{alta_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -111,7 +142,8 @@
 Requires: SUNWcnetr
 
 %package tu
-Summary:       Nic driver for 2114x fast ethernet chipset
+Summary:       NIC driver for 2114x fast ethernet chipset
+Version:       %{tu_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -120,7 +152,8 @@
 Requires: SUNWcnetr
 
 %package bfe
-Summary:       Nic driver for bcm4401 fast ethernet chipset
+Summary:       NIC driver for bcm4401 fast ethernet chipset
+Version:       %{bfe_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -129,7 +162,8 @@
 Requires: SUNWcnetr
 
 %package tne
-Summary:       Nic driver for TI ThunderLAN fast ethernet chipset
+Summary:       NIC driver for TI ThunderLAN fast ethernet chipset
+Version:       %{tne_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -138,7 +172,8 @@
 Requires: SUNWcnetr
 
 %package epfe
-Summary:       Nic driver for SMSC epic fast ethernet chipset series
+Summary:       NIC driver for SMSC epic fast ethernet chipset series
+Version:       %{epfe_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -147,7 +182,8 @@
 Requires: SUNWcnetr
 
 %package mtd
-Summary:       Nic driver for Myson mtd803 fast ethernet chipset
+Summary:       NIC driver for Myson mtd803 fast ethernet chipset
+Version:       %{mtd_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -156,7 +192,8 @@
 Requires: SUNWcnetr
 
 %package ae
-Summary:       Nic driver for AMD am79c97x PCNET ethernet chipset series
+Summary:       NIC driver for AMD am79c97x PCNET ethernet chipset series
+Version:       %{ae_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -165,7 +202,8 @@
 Requires: SUNWcnetr
 
 %package gani
-Summary:       Nic driver for Realtek rtl8169 rtl8110 rtl8168 rtl8101 PCI/PCI-Express GbE chipset
+Summary:       NIC driver for Realtek rtl8169 rtl8110 rtl8168 rtl8101 PCI/PCI-Express GbE chipset
+Version:       %{gani_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -174,7 +212,18 @@
 Requires: SUNWcnetr
 
 %package vel
-Summary:       Nic driver for VIA VT6122 GbE chipset
+Summary:       NIC driver for VIA VT6122 GbE chipset
+Version:       %{vel_version}
+SUNW_BaseDir:  /
+%include default-depend.inc
+Requires: %{name}
+Requires: SUNWcakr
+Requires: SUNWckr
+Requires: SUNWcnetr
+
+%package nfo
+Summary:       NIC driver for NVIDIA nForce chipset built-in ethernet controller
+Version:       %{nfo_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -183,7 +232,8 @@
 Requires: SUNWcnetr
 
 %package icpt
-Summary:       Nic driver for IC Plus ip1000a GbE chipset
+Summary:       NIC driver for IC Plus ip1000a GbE chipset
+Version:       %{icpt_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -192,7 +242,8 @@
 Requires: SUNWcnetr
 
 %package sige
-Summary:       Nic driver for SiS integrated fast/gigabit ethernet controller sis190/sis191
+Summary:       NIC driver for SiS integrated fast/gigabit ethernet controller sis190/sis191
+Version:       %{sige_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -201,7 +252,8 @@
 Requires: SUNWcnetr
 
 %package myk
-Summary:       Nic driver for marvell PCI-E GbE controller yukon2
+Summary:       NIC driver for marvell PCI-E GbE controller yukon2
+Version:       %{myk_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -210,7 +262,8 @@
 Requires: SUNWcnetr
 
 %package urf
-Summary:       Nic driver for Realtek rtl8150 usb1.x to fast ethernet controller
+Summary:       NIC driver for Realtek rtl8150 usb1.x to fast ethernet controller
+Version:       %{urf_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -219,7 +272,8 @@
 Requires: SUNWcnetr
 
 %package axf
-Summary:       Nic driver for ASIX AX88172 usb2.0 to fast ethernet controller
+Summary:       NIC driver for ASIX AX88172 usb2.0 to fast ethernet controller
+Version:       %{axf_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -228,7 +282,8 @@
 Requires: SUNWcnetr
 
 %package upf
-Summary:       Nic driver for ADMtek Pegasus family usb1.x to fast ethernet controller
+Summary:       NIC driver for ADMtek Pegasus family usb1.x to fast ethernet controller
+Version:       %{upf_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -237,7 +292,8 @@
 Requires: SUNWcnetr
 
 %package ife
-Summary:       Nic driver for intel 8255x fast ethernet chipset
+Summary:       NIC driver for intel 8255x fast ethernet chipset
+Version:       %{ife_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -246,7 +302,8 @@
 Requires: SUNWcnetr
 
 %package tcfe
-Summary:       Nic driver for 3Com cardbus/PCI fast ethernet cards
+Summary:       NIC driver for 3Com cardbus/PCI fast ethernet cards
+Version:       %{tcfe_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -255,7 +312,8 @@
 Requires: SUNWcnetr
 
 %package em
-Summary:       Nic driver for intel gigabit ethernet controller 8254x
+Summary:       NIC driver for intel gigabit ethernet controller 8254x
+Version:       %{em_version}
 SUNW_BaseDir:  /
 %include default-depend.inc
 Requires: %{name}
@@ -285,6 +343,7 @@
 %setup -T -D -a 18
 %setup -T -D -a 19
 %setup -T -D -a 20
+%setup -T -D -a 21
 %setup -T -D -a 104
 %patch1 -p0
 %patch2 -p0
@@ -298,21 +357,21 @@
 for src in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
 	%{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} \
 	%{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} \
-	%{SOURCE18} %{SOURCE19} %{SOURCE20}
+	%{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21}
 do
 	drvdir=`basename ${src} | sed 's/\.tar\.gz//'`
-	# use newest 2.6 gem code from alta if possible, else 2.4 from em
+	# use newest GEM 2.6 code if possible, else 2.4 from em
 	case "$drvdir" in
-		alta-*|em-*|myk-*) #myk has an incompatible interface
+		em-*|myk-*) # GEM code donors
 		;;
-		rf-*|tne-*|epfe-*|mtd-*|gani-*|vel-*|icpt-*|tcfe-*)
-		# uses outdated gem interface, consider updating
+		# these drivers have a GEM 2.4 interface, consider updating
+		*-2.4.*)
 		rm -f $drvdir/gem.c $drvdir/gem.h
 		cp em-*/gem.c em-*/gem.h $drvdir
 		;;
-		*)
+		*-2.6.*)
 		rm -f $drvdir/gem.c $drvdir/gem.h
-		cp alta-*/gem.c alta-*/gem.h $drvdir
+		cp myk-*/gem.c myk-*/gem.h $drvdir
 		;;
 	esac
 done
@@ -340,14 +399,23 @@
 for src in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
 	%{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} \
 	%{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} \
-	%{SOURCE18} %{SOURCE19} %{SOURCE20}
+	%{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21}
 do
 	drvdir=`basename ${src} | sed 's/\.tar\.gz//'`
 	cd $drvdir
 	rm Makefile
 	if [ -f Makefile.config_gld3 -a "$gld" = "3" ]; then
 		rm -f Makefile.config
-		cat Makefile.config_gld3 | sed "s,/home/mrym/opensolaris/usr/src/uts/common,`pwd`/../gldv3-headers/common,g" > Makefile.config
+		# some configs don't use ONUTSDIR
+		cat Makefile.config_gld3 | sed "s,/home/mrym/opensolaris/usr/src/uts,`pwd`/../gldv3-headers,g" > Makefile.config
+		# some configs don't have all the new magic
+		cat >> Makefile.config <<EOF
+CFGFLAGS += \
+	    -Unotdef -UNEVER -UGEM_GCC_RUNTIME \
+	    -UGEM_COMPAT -USANITY -UGEM_CONFIG_FMA -UMODULE \
+	    -UGEM_CONFIG_RX_DIRECT -DGEM_CONFIG_TX_DIRECT \
+	    -DCONFIG_PM
+EOF
 	fi
 		
 
@@ -417,7 +485,7 @@
 for src in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
 	%{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} \
 	%{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} \
-	%{SOURCE18} %{SOURCE19} %{SOURCE20}
+	%{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21}
 do
 	drvdir=`basename ${src} | sed 's/\.tar\.gz//'`
 	cd $drvdir
@@ -566,6 +634,13 @@
 BASEDIR=${BASEDIR:=/}
 ${BASEDIR}%{_localstatedir}/nicdrv/scripts/drvrm ${BASEDIR} vel
 
+%post nfo
+. ${BASEDIR:=}%{_localstatedir}/nicdrv/scripts/nfo.postinst
+
+%postun nfo
+BASEDIR=${BASEDIR:=/}
+${BASEDIR}%{_localstatedir}/nicdrv/scripts/drvrm ${BASEDIR} nfo
+
 %post icpt
 . ${BASEDIR:=}%{_localstatedir}/nicdrv/scripts/icpt.postinst
 
@@ -724,6 +799,13 @@
 %dir %attr (0755, root, bin) %{_localstatedir}/nicdrv/scripts
 %attr (0644, root, bin) %{_localstatedir}/nicdrv/scripts/vel.postinst
 
+%files nfo -f nfo.files
+%defattr (-, root, sys)
+%dir %attr (0755, root, sys) %{_localstatedir}
+%dir %attr (0755, root, bin) %{_localstatedir}/nicdrv
+%dir %attr (0755, root, bin) %{_localstatedir}/nicdrv/scripts
+%attr (0644, root, bin) %{_localstatedir}/nicdrv/scripts/nfo.postinst
+
 %files icpt -f icpt.files
 %defattr (-, root, sys)
 %dir %attr (0755, root, sys) %{_localstatedir}
@@ -788,6 +870,10 @@
 %attr (0644, root, bin) %{_localstatedir}/nicdrv/scripts/em.postinst
 
 %changelog
+* Sat Jun 07 2008 - [email protected]
+- Use driver version numbers in SFEnicdrv-* packages
+- Update to vel-2.6.0, sige-2.6.2, myk-2.6.0
+- Add nfo driver
 * Tue Mar 26 2008 - [email protected]
 - Fix compilation on amd64
 * Sat Mar 22 2008 - [email protected]

--- a/patches/nicdrv-05-myk.diff	Sat Jun 07 15:17:48 2008 +0000
+++ b/patches/nicdrv-05-myk.diff	Sat Jun 07 20:01:38 2008 +0000
@@ -1,8 +1,8 @@
---- myk-2.5.0/adddrv.sh.orig	2008-02-09 23:56:32.588167663 +0530
-+++ myk-2.5.0/adddrv.sh	2008-02-09 23:57:21.818166028 +0530
-@@ -25,28 +25,5 @@
- set DEVLIST = ( $DEVLIST '"pciex11ab,4362"' )
- set DEVLIST = ( $DEVLIST '"pciex11ab,4363"' )
+--- myk-2.6.0.orig/adddrv.sh	2008-04-20 07:37:51.000000000 -0400
++++ myk-2.6.0/adddrv.sh	2008-06-07 13:50:34.050024427 -0400
+@@ -49,28 +49,5 @@
+ set DEVLIST = ( $DEVLIST '"pci11ab,436d"' )	# 88E8055
+ set DEVLIST = ( $DEVLIST '"pci11ab,4370"' )	# 88E8075
  
 -#echo $DEVLIST
 -

--- a/patches/nicdrv-08-alta.diff	Sat Jun 07 15:17:48 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- alta-2.6.0/gem.h.orig	Sat Feb  2 21:41:18 2008
-+++ alta-2.6.0/gem.h	Sat Mar 22 23:00:26 2008
-@@ -672,7 +672,15 @@
- int gem_pci_set_power_state(dev_info_t *, ddi_acc_handle_t, uint_t);
- int gem_pci_regs_map_setup(dev_info_t *, uint32_t, uint32_t,
- 	struct ddi_device_acc_attr *, caddr_t *, ddi_acc_handle_t *);
--#ifndef GEM_CONFIG_GLDv3
-+#ifdef GEM_CONFIG_GLDv3
-+#define	gem_getinfo	nulldev
-+#define	gem_open	NULL
-+#define	gem_close	NULL
-+#define	gem_wput	NULL
-+#define	gem_wsrv	NULL
-+#define	gem_rsrv	NULL
-+#define	gem_power	NULL
-+#else
- #define	gem_getinfo	gld_getinfo
- #define	gem_open	gld_open
- #define	gem_close	gld_close

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nicdrv-08-gldv3.diff	Sat Jun 07 20:01:38 2008 +0000
@@ -0,0 +1,19 @@
+--- myk-2.6.0/gem.h.orig	Sat Feb  2 21:41:18 2008
++++ myk-2.6.0/gem.h	Sat Mar 22 23:00:26 2008
+@@ -672,7 +672,15 @@
+ int gem_pci_set_power_state(dev_info_t *, ddi_acc_handle_t, uint_t);
+ int gem_pci_regs_map_setup(dev_info_t *, uint32_t, uint32_t,
+ 	struct ddi_device_acc_attr *, caddr_t *, ddi_acc_handle_t *);
+-#ifndef GEM_CONFIG_GLDv3
++#ifdef GEM_CONFIG_GLDv3
++#define	gem_getinfo	nulldev
++#define	gem_open	NULL
++#define	gem_close	NULL
++#define	gem_wput	NULL
++#define	gem_wsrv	NULL
++#define	gem_rsrv	NULL
++#define	gem_power	NULL
++#else
+ #define	gem_getinfo	gld_getinfo
+ #define	gem_open	gld_open
+ #define	gem_close	gld_close