Move to generating pccarddevs.h on the fly, both for the kernel and
the modules. Also generate usbdevs.h automatically now, but a non-kernel file is stopping that at the moment.
This commit is contained in:
parent
79af3d91df
commit
dba6dd177b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=129740
@ -40,6 +40,16 @@ miidevs.h standard \
|
||||
compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
|
||||
no-obj no-implicit-rule \
|
||||
clean "miidevs.h"
|
||||
pccarddevs.h standard \
|
||||
dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
|
||||
compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
|
||||
no-obj no-implicit-rule \
|
||||
clean "pccarddevs.h"
|
||||
usbdevs.h standard \
|
||||
dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
|
||||
compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
|
||||
no-obj no-implicit-rule \
|
||||
clean "usbdevs.h"
|
||||
kern/device_if.m standard
|
||||
kern/bus_if.m standard
|
||||
kern/clock_if.m optional genclock
|
||||
|
@ -326,16 +326,18 @@ vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src
|
||||
.endif
|
||||
.endfor
|
||||
|
||||
.if ${SRCS:Mmiidevs.h} != ""
|
||||
CLEANFILES+= miidevs.h
|
||||
.for _i in mii pccard usb
|
||||
.if ${SRCS:M${_i}devs.h} != ""
|
||||
CLEANFILES+= ${_i}devs.h
|
||||
.if !exists(@)
|
||||
miidevs.h: @
|
||||
${_i}devs.h: @
|
||||
.endif
|
||||
.if exists(@)
|
||||
miidevs.h: @/tools/miidevs2h.awk @/dev/mii/miidevs
|
||||
${_i}devs.h: @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs
|
||||
.endif
|
||||
${AWK} -f @/tools/miidevs2h.awk @/dev/mii/miidevs
|
||||
${AWK} -f @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs
|
||||
.endif
|
||||
.endfor # _i
|
||||
|
||||
regress:
|
||||
|
||||
|
@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <dev/aic/aicvar.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
#include "card_if.h"
|
||||
|
||||
|
@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <net/if_media.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include "card_if.h"
|
||||
|
||||
#include <dev/an/if_aironet_ieee.h>
|
||||
|
@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/rman.h>
|
||||
#include <dev/ata/ata-all.h>
|
||||
#include <dev/pccard/pccard_cis.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
|
||||
|
@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/awi/awivar.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include "card_if.h"
|
||||
|
||||
struct awi_pccard_softc {
|
||||
|
@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/cs/if_csvar.h>
|
||||
#include <dev/cs/if_csreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
#include "card_if.h"
|
||||
|
||||
|
@ -51,7 +51,7 @@
|
||||
#include <dev/ed/if_edreg.h>
|
||||
#include <dev/ed/if_edvar.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#ifndef ED_NO_MIIBUS
|
||||
#include <dev/mii/mii.h>
|
||||
#include <dev/mii/miivar.h>
|
||||
|
@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/ep/if_epvar.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
#include "card_if.h"
|
||||
|
||||
|
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/ex/if_exvar.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
static const struct pccard_product ex_pccard_products[] = {
|
||||
PCMCIA_CARD(OLICOM, OC2220, 0),
|
||||
|
@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/fe/if_fevar.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include "card_if.h"
|
||||
#include <pccard/cardinfo.h>
|
||||
|
||||
|
@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <dev/pccard/pccardreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
static int
|
||||
joy_pccard_match(device_t dev)
|
||||
|
@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/device_port.h>
|
||||
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
|
||||
#include <cam/scsi/scsi_low.h>
|
||||
|
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/device_port.h>
|
||||
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
|
||||
#include <cam/scsi/scsi_low.h>
|
||||
|
@ -60,7 +60,7 @@
|
||||
#include <dev/owi/if_ieee80211.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
#include <dev/wi/if_wavelan_ieee.h>
|
||||
#include <dev/owi/if_wivar.h>
|
||||
|
@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/rman.h>
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccard_cis.h>
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/timepps.h>
|
||||
|
||||
#include <dev/pccard/pccard_cis.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
|
||||
|
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <dev/sn/if_snvar.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
#include "card_if.h"
|
||||
|
||||
|
@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/device_port.h>
|
||||
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
|
||||
#include <cam/scsi/scsi_low.h>
|
||||
|
@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <dev/pccard/pccard_cis.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccardreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
|
||||
|
@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#if __FreeBSD_version >= 500000
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#endif
|
||||
|
||||
#include <dev/wi/if_wavelan_ieee.h>
|
||||
|
@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <dev/xe/if_xevar.h>
|
||||
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
#include <dev/pccard/pccard_cis.h>
|
||||
#include "card_if.h"
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
KMOD= aic
|
||||
SRCS= aic.c aic_pccard.c
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
|
||||
SRCS+= device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
|
||||
SRCS+= opt_cam.h opt_scsi.h
|
||||
|
||||
.if ${MACHINE} == "pc98"
|
||||
|
@ -5,6 +5,7 @@
|
||||
KMOD= if_an
|
||||
SRCS= if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
|
||||
SRCS+= opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
|
||||
SRCS+= pccarddevs.h
|
||||
|
||||
opt_inet.h:
|
||||
echo "#define INET 1" > opt_inet.h
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
KMOD= if_awi
|
||||
SRCS= am79c930.c awi.c if_awi_pccard.c
|
||||
SRCS+= bus_if.h card_if.h device_if.h opt_inet.h
|
||||
SRCS+= bus_if.h card_if.h device_if.h opt_inet.h pccarddevs.h
|
||||
|
||||
opt_inet.h:
|
||||
echo "#define INET 1" > opt_inet.h
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= if_cs
|
||||
SRCS= if_cs.c if_cs_pccard.c if_cs_isa.c
|
||||
SRCS+= bus_if.h card_if.h device_if.h isa_if.h
|
||||
SRCS+= bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -12,6 +12,6 @@ SRCS+= if_ed_isa.c
|
||||
.endif
|
||||
|
||||
SRCS+= opt_ed.h opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h \
|
||||
miibus_if.h
|
||||
miibus_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -7,6 +7,6 @@ SRCS= if_ep.c if_ep_pccard.c
|
||||
SRCS+= if_ep_isa.c
|
||||
#SRCS+= if_ep_eisa.c
|
||||
#SRCS+= if_ep_mca.c
|
||||
SRCS+= opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h
|
||||
SRCS+= opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -7,6 +7,6 @@ KMOD= if_ex
|
||||
SRCS= if_ex.c \
|
||||
if_ex_isa.c isa_if.h \
|
||||
if_ex_pccard.c card_if.h \
|
||||
bus_if.h device_if.h
|
||||
bus_if.h device_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -3,6 +3,6 @@
|
||||
.PATH: ${.CURDIR}/../../dev/exca
|
||||
|
||||
KMOD= exca
|
||||
SRCS= exca.c device_if.h bus_if.h power_if.h card_if.h
|
||||
SRCS= exca.c device_if.h bus_if.h power_if.h card_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -13,7 +13,7 @@ SRCS= fd.c
|
||||
SRCS= fdc.c
|
||||
.endif
|
||||
SRCS+= opt_fdc.h card.h \
|
||||
bus_if.h card_if.h device_if.h isa_if.h
|
||||
bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
|
||||
|
||||
FDC_DEBUG?= 0 # 0/1
|
||||
FDC_PCCARD?= 1 # 0/1 whether pccard support (i. e. Y-E DATA PCMCIA
|
||||
|
@ -11,6 +11,6 @@ SRCS+= if_fe_cbus.c
|
||||
SRCS+= if_fe_isa.c
|
||||
.endif
|
||||
|
||||
SRCS+= bus_if.h card_if.h device_if.h isa_if.h
|
||||
SRCS+= bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= if_ndis
|
||||
SRCS= if_ndis.c if_ndis_pci.c if_ndis_pccard.c
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -3,6 +3,7 @@
|
||||
.PATH: ${.CURDIR}/../../dev/joy
|
||||
|
||||
KMOD= joy
|
||||
SRCS= bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c
|
||||
SRCS= bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c \
|
||||
pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
KMOD= ncv
|
||||
SRCS= ncr53c500_pccard.c ncr53c500.c
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
|
||||
SRCS+= opt_cam.h opt_scsi.h opt_ddb.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -7,7 +7,7 @@ CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \
|
||||
-I${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c
|
||||
|
||||
KMOD= ng_bt3c
|
||||
SRCS= ng_bt3c_pccard.c bus_if.h card_if.h device_if.h
|
||||
SRCS= ng_bt3c_pccard.c bus_if.h card_if.h device_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
KMOD= nsp
|
||||
SRCS= nsp.c nsp_pccard.c
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h
|
||||
SRCS+= opt_cam.h opt_scsi.h opt_ddb.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -5,7 +5,7 @@
|
||||
KMOD= oldcard
|
||||
SRCS= pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_pci.c pcic_isa.c \
|
||||
opt_pcic.h device_if.h bus_if.h isa_if.h pci_if.h \
|
||||
power_if.h card_if.h
|
||||
power_if.h card_if.h pccarddevs.h
|
||||
|
||||
EXPORT_SYMS= YES # XXX evaluate
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
KMOD= if_owi
|
||||
SRCS= opt_wi.h if_owi.c if_owi_pccard.c \
|
||||
card_if.h device_if.h bus_if.h pci_if.h
|
||||
card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
|
||||
|
||||
opt_wi.h:
|
||||
touch ${.TARGET}
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= pccard
|
||||
SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c \
|
||||
device_if.h bus_if.h card_if.h power_if.h
|
||||
device_if.h bus_if.h card_if.h power_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= pcic
|
||||
SRCS= i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \
|
||||
power_if.h card_if.h power_if.c card_if.c
|
||||
power_if.h card_if.h power_if.c card_if.c pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= if_ray
|
||||
SRCS= if_ray.c
|
||||
SRCS+= device_if.h bus_if.h card_if.h opt_inet.h
|
||||
SRCS+= device_if.h bus_if.h card_if.h opt_inet.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -8,7 +8,7 @@
|
||||
KMOD= sio
|
||||
SRCS= bus_if.h card_if.h device_if.h isa_if.h pci_if.h \
|
||||
opt_comconsole.h opt_compat.h opt_ddb.h opt_sio.h \
|
||||
sio.c sio_pccard.c sio_pci.c sio_puc.c
|
||||
sio.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h
|
||||
.if ${MACHINE} == "pc98"
|
||||
SRCS+= sio_cbus.c
|
||||
.else
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= if_sn
|
||||
SRCS= if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \
|
||||
card_if.h
|
||||
card_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -5,7 +5,7 @@
|
||||
KMOD= stg
|
||||
SRCS= tmc18c30.c tmc18c30_subr.c \
|
||||
tmc18c30_isa.c isa_if.h \
|
||||
tmc18c30_pccard.c card_if.h \
|
||||
tmc18c30_pccard.c card_if.h pccarddevs.h \
|
||||
tmc18c30_pci.c pci_if.h
|
||||
SRCS+= opt_bdg.h device_if.h bus_if.h
|
||||
SRCS+= opt_cam.h opt_scsi.h opt_ddb.h
|
||||
|
@ -11,6 +11,7 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
|
||||
uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \
|
||||
uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \
|
||||
uart_dev_z8530.c uart_if.c uart_subr.c uart_tty.c
|
||||
SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h
|
||||
SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h \
|
||||
pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
KMOD= if_wi
|
||||
SRCS= opt_wi.h if_wi.c if_wi_pccard.c if_wi_pci.c \
|
||||
card_if.h device_if.h bus_if.h pci_if.h
|
||||
card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
|
||||
|
||||
opt_wi.h:
|
||||
echo "#define WI_SYMBOL_FIRMWARE 1" > ${.TARGET}
|
||||
|
@ -4,6 +4,6 @@
|
||||
|
||||
KMOD= if_xe
|
||||
SRCS= if_xe.c if_xe_pccard.c
|
||||
SRCS+= bus_if.h card_if.h device_if.h
|
||||
SRCS+= bus_if.h card_if.h device_if.h pccarddevs.h
|
||||
|
||||
.include <bsd.kmod.mk>
|
||||
|
@ -59,7 +59,7 @@
|
||||
|
||||
#include <dev/pccard/pccardreg.h>
|
||||
#include <dev/pccard/pccardvar.h>
|
||||
#include <dev/pccard/pccarddevs.h>
|
||||
#include "pccarddevs.h"
|
||||
|
||||
#include <netgraph/ng_message.h>
|
||||
#include <netgraph/netgraph.h>
|
||||
|
Loading…
Reference in New Issue
Block a user