diff options
author | marius <marius@FreeBSD.org> | 2005-06-10 20:56:38 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2005-06-10 20:56:38 +0000 |
commit | 9afc57a1d6b7a82c8cce67a9b6da734e64da5fef (patch) | |
tree | 73faadc85aaf50514c90a2b39f6e6c558347a47d /sys/conf | |
parent | a23214e059e07a8642c27d57c541ce60479d3d53 (diff) | |
download | FreeBSD-src-9afc57a1d6b7a82c8cce67a9b6da734e64da5fef.zip FreeBSD-src-9afc57a1d6b7a82c8cce67a9b6da734e64da5fef.tar.gz |
- Hook up the new locations of the atkbdc(4), atkbd(4) and psm(4) source
files after they were repo-copied to sys/dev/atkbdc. The sources of
atkbdc(4) and its children were moved to the new location in preparation
for adding an EBus front-end to atkbdc(4) for use on sparc64; i.e. in
order to not further scatter them over the whole tree which would have
been the result of adding atkbdc_ebus.c in e.g. sys/sparc64/ebus. Another
reason for the repo-copies was that some of the sources were misfiled,
e.g. sys/isa/atkbd_isa.c wasn't ISA-specific at all but for hanging
atkbd(4) off of atkbdc(4) and was renamed to atkbd_atkbdc.c accordingly.
Most of sys/isa/psm.c, i.e. expect for its PSMC PNP part, also isn't
ISA-specific.
- Separate the parts of atkbdc_isa.c which aren't actually ISA-specific
but are shareable between different atkbdc(4) bus front-ends into
atkbdc_subr.c (repo-copied from atkbdc_isa.c). While here use
bus_generic_rl_alloc_resource() and bus_generic_rl_release_resource()
respectively in atkbdc_isa.c instead of rolling own versions.
- Add sparc64 MD bits to atkbdc(4) and atkbd(4) and an EBus front-end for
atkbdc(4). PS/2 controllers and input devices are used on a couple of
Sun OEM boards and occur on either the EBus or the ISA bus. Depending on
the board it's either the only on-board mean to connect a keyboard and
mouse or an alternative to either RS232 or USB devices.
- Wrap the PSMC PNP part of psm.c in #ifdef DEV_ISA so it can be compiled
without isa(4) (e.g. for EBus-only machines). This ISA-specific part
isn't separated into its own source file, yet, as it requires more work
than was feasible for 6.0 in order to do it in a clean way. Actually
philip@ is working on a rewrite of psm(4) so a more comprehensive
clean-up and separation of hardware dependent and independent parts is
expected to happen after 6.0.
Tested on: i386, sparc64 (AX1105, AXe and AXi boards)
Reviewed by: philip
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files.alpha | 11 | ||||
-rw-r--r-- | sys/conf/files.amd64 | 11 | ||||
-rw-r--r-- | sys/conf/files.i386 | 11 | ||||
-rw-r--r-- | sys/conf/files.ia64 | 11 |
4 files changed, 24 insertions, 20 deletions
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index a048627..200cb96 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -166,6 +166,12 @@ crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa +dev/atkbdc/atkbd.c optional atkbd atkbdc +dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc +dev/atkbdc/atkbdc.c optional atkbdc +dev/atkbdc/atkbdc_isa.c optional atkbdc isa +dev/atkbdc/atkbdc_subr.c optional atkbdc +dev/atkbdc/psm.c optional psm atkbdc dev/dec/mcclock.c optional mcclock dev/dec/mcclock_if.m optional mcclock dev/ed/if_ed_3c503.c optional ed isa ed_3c503 @@ -180,8 +186,6 @@ dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/hwpmc/hwpmc_alpha.c optional hwpmc -dev/kbd/atkbd.c optional atkbd -dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd @@ -202,9 +206,6 @@ dev/syscons/sysmouse.c optional sc dev/uart/uart_cpu_alpha.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard -isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga libkern/alpha/bswap16.S standard diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index fadaa16..af01789 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -132,6 +132,12 @@ crypto/des/des_enc.c optional netsmbcrypto crypto/des/des_setkey.c optional netsmbcrypto dev/acpica/acpi_if.m standard dev/arcmsr/arcmsr.c optional arcmsr pci +dev/atkbdc/atkbd.c optional atkbd atkbdc +dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc +dev/atkbdc/atkbdc.c optional atkbdc +dev/atkbdc/atkbdc_isa.c optional atkbdc isa +dev/atkbdc/atkbdc_subr.c optional atkbdc +dev/atkbdc/psm.c optional psm atkbdc dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash @@ -149,8 +155,6 @@ dev/fdc/fdc_pccard.c optional fdc pccard dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc -dev/kbd/atkbd.c optional atkbd -dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd @@ -175,9 +179,6 @@ geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard -isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/link_elf_obj.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index f9d6c34..d390215 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -145,6 +145,12 @@ dev/ar/if_ar_isa.c optional ar isa dev/ar/if_ar_pci.c optional ar pci dev/arl/if_arl.c optional arl dev/arl/if_arl_isa.c optional arl isa +dev/atkbdc/atkbd.c optional atkbd atkbdc +dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc +dev/atkbdc/atkbdc.c optional atkbdc +dev/atkbdc/atkbdc_isa.c optional atkbdc isa +dev/atkbdc/atkbdc_subr.c optional atkbdc +dev/atkbdc/psm.c optional psm atkbdc dev/cm/if_cm_isa.c optional cm isa dev/cp/cpddk.c optional cp dev/cp/if_cp.c optional cp @@ -185,8 +191,6 @@ dev/if_ndis/if_ndis_pci.c optional ndis cardbus dev/if_ndis/if_ndis_pci.c optional ndis pci dev/if_ndis/if_ndis_usb.c optional ndis usb dev/io/iodev.c optional io -dev/kbd/atkbd.c optional atkbd -dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd @@ -448,9 +452,6 @@ i4b/layer1/itjc/i4b_itjc_isac.c optional itjc i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # -isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index 991281e..48cec80 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -48,13 +48,17 @@ crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa +dev/atkbdc/atkbd.c optional atkbd atkbdc +dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc +dev/atkbdc/atkbdc.c optional atkbdc +dev/atkbdc/atkbdc_isa.c optional atkbdc isa +dev/atkbdc/atkbdc_subr.c optional atkbdc +dev/atkbdc/psm.c optional psm atkbdc dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/hwpmc/hwpmc_ia64.c optional hwpmc -dev/kbd/atkbd.c optional atkbd -dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd @@ -125,9 +129,6 @@ ia64/ia64/vm_machdep.c standard ia64/isa/isa.c optional isa ia64/isa/isa_dma.c optional isa ia64/pci/pci_cfgreg.c optional pci -isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/imgact_elf32.c optional compat_ia32 |