cvs commit: src/sys/conf files.alpha files.amd64 files.i386 files.ia64 src/sys/dev/atkbdc atkbd.c atkbd_atkbdc.c atkbdc.c atkbdc_ebus.c atkbdc_isa.c atkbdc_subr.c atkbdc_subr.h atkbdcreg.h atkbdreg.h psm.c psm.h src/sys/dev/kbd atkbd.c atkbdc.c ...

[Marius Strobl]

marius      2005-06-10 20:56:38 UTC

  FreeBSD src repository

  Modified files:
    sys/conf             files.alpha files.amd64 files.i386 
                         files.ia64 
    sys/dev/atkbdc       atkbd.c atkbd_atkbdc.c atkbdc.c 
                         atkbdc_isa.c atkbdc_subr.c atkbdcreg.h 
                         atkbdreg.h psm.c 
    sys/i386/isa/pcvt    pcvt_hdr.h 
  Added files:
    sys/dev/atkbdc       atkbdc_ebus.c atkbdc_subr.h psm.h 
  Removed files:
    sys/dev/kbd          atkbd.c atkbdc.c atkbdcreg.h atkbdreg.h 
    sys/isa              atkbd_isa.c atkbdc_isa.c psm.c 
  Log:
  - 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
  
  Revision  Changes    Path
  1.119     +6 -5      src/sys/conf/files.alpha
  1.67      +6 -5      src/sys/conf/files.amd64
  1.535     +6 -5      src/sys/conf/files.i386
  1.78      +6 -5      src/sys/conf/files.ia64
  1.47      +36 -7     src/sys/dev/atkbdc/atkbd.c
  1.19      +5 -8      src/sys/dev/atkbdc/atkbd_atkbdc.c
  1.21      +53 -8     src/sys/dev/atkbdc/atkbdc.c
  1.1       +304 -0    src/sys/dev/atkbdc/atkbdc_ebus.c (new)
  1.33      +20 -150   src/sys/dev/atkbdc/atkbdc_isa.c
  1.33      +11 -247   src/sys/dev/atkbdc/atkbdc_subr.c
  1.1       +53 -0     src/sys/dev/atkbdc/atkbdc_subr.h (new)
  1.12      +3 -3      src/sys/dev/atkbdc/atkbdcreg.h
  1.9       +3 -3      src/sys/dev/atkbdc/atkbdreg.h
  1.86      +35 -27    src/sys/dev/atkbdc/psm.c
  1.1       +32 -0     src/sys/dev/atkbdc/psm.h (new)
  1.46      +0 -1441   src/sys/dev/kbd/atkbd.c (dead)
  1.20      +0 -1042   src/sys/dev/kbd/atkbdc.c (dead)
  1.11      +0 -264    src/sys/dev/kbd/atkbdcreg.h (dead)
  1.8       +0 -48     src/sys/dev/kbd/atkbdreg.h (dead)
  1.55      +1 -1      src/sys/i386/isa/pcvt/pcvt_hdr.h
  1.18      +0 -180    src/sys/isa/atkbd_isa.c (dead)
  1.32      +0 -365    src/sys/isa/atkbdc_isa.c (dead)
  1.85      +0 -3658   src/sys/isa/psm.c (dead)