Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys This is the first check-in of CardBus driver. CardBus d...



details:   https://anonhg.NetBSD.org/src/rev/f9ecb47a393a
branches:  trunk
changeset: 477192:f9ecb47a393a
user:      haya <haya%NetBSD.org@localhost>
date:      Fri Oct 15 06:07:17 1999 +0000

description:
This is the first check-in of CardBus driver.  CardBus driver contains
CardBus bus stub, YENTA PCI-CardBus bridge (cbb), 3Com 3C575TX driver
(ex) and Intel fxp driver.

TODO:
  o Conform to the KNF more strictly.
  o Be unified with pcmcia code as much as possible.
  o Add more drivers for CardBus card, such as APA-1480 or USB card.

The affected files are listed below.

        sys/arch/i386/conf/files.i386
        sys/arch/macppc/conf/files.macppc
        sys/conf/files
        sys/dev/ic/elinkxl.c
        sys/dev/ic/elinkxlvar.h
        sys/dev/ic/i82365.c
        sys/dev/ic/i82365var.h
        sys/dev/isa/i82365_isasubr.c
        sys/dev/pci/files.pci
        sys/dev/pcmcia/pcmcia.c
        sys/dev/pcmcia/pcmciachip.h

The added files are listed below.

        sys/arch/i386/conf/CARDBUS
        sys/arch/i386/include/rbus_machdep.h
        sys/arch/i386/i386/rbus_machdep.c
        sys/arch/macppc/include/rbus_machdep.h
        sys/arch/macppc/macppc/rbus_machdep.c
        sys/dev/cardbus/if_ex_cardbus.c
        sys/dev/cardbus/Makefile.cardbusdevs
        sys/dev/cardbus/cardbus.c
        sys/dev/cardbus/cardbus_map.c
        sys/dev/cardbus/cardbusdevs
        sys/dev/cardbus/cardbusdevs.h
        sys/dev/cardbus/cardbusdevs_data.h
        sys/dev/cardbus/cardbusvar.h
        sys/dev/cardbus/cardslot.c
        sys/dev/cardbus/cardslotvar.h
        sys/dev/cardbus/devlist2h.awk
        sys/dev/cardbus/files.cardbus
        sys/dev/cardbus/if_fxp_cardbus.c
        sys/dev/cardbus/pccardcis.h
        sys/dev/cardbus/rbus.c
        sys/dev/cardbus/rbus.h
        sys/dev/pci/pccbb.c
        sys/dev/pci/pccbbreg.h
        sys/dev/pci/pccbbvar.h

diffstat:

 sys/arch/i386/conf/CARDBUS             |   652 ++++++
 sys/arch/i386/conf/files.i386          |     8 +-
 sys/arch/i386/i386/rbus_machdep.c      |   160 +
 sys/arch/i386/include/rbus_machdep.h   |    51 +
 sys/arch/macppc/conf/files.macppc      |     9 +-
 sys/arch/macppc/include/rbus_machdep.h |    42 +
 sys/arch/macppc/macppc/rbus_machdep.c  |   153 +
 sys/conf/files                         |     4 +-
 sys/dev/cardbus/Makefile.cardbusdevs   |     7 +
 sys/dev/cardbus/cardbus.c              |   609 ++++++
 sys/dev/cardbus/cardbus_map.c          |   373 +++
 sys/dev/cardbus/cardbusdevs            |    69 +
 sys/dev/cardbus/cardbusvar.h           |   365 +++
 sys/dev/cardbus/cardslot.c             |   426 ++++
 sys/dev/cardbus/cardslotvar.h          |   121 +
 sys/dev/cardbus/devlist2h.awk          |   221 ++
 sys/dev/cardbus/files.cardbus          |    33 +
 sys/dev/cardbus/if_ex_cardbus.c        |   415 ++++
 sys/dev/cardbus/if_fxp_cardbus.c       |   281 ++
 sys/dev/cardbus/pccardcis.h            |    92 +
 sys/dev/cardbus/rbus.c                 |   394 ++++
 sys/dev/cardbus/rbus.h                 |   165 +
 sys/dev/ic/elinkxl.c                   |    15 +-
 sys/dev/ic/elinkxlvar.h                |     4 +-
 sys/dev/ic/i82365.c                    |   138 +-
 sys/dev/ic/i82365var.h                 |    23 +-
 sys/dev/isa/i82365_isasubr.c           |     8 +-
 sys/dev/pci/files.pci                  |     8 +-
 sys/dev/pci/pccbb.c                    |  3041 ++++++++++++++++++++++++++++++++
 sys/dev/pci/pccbbreg.h                 |   220 ++
 sys/dev/pci/pccbbvar.h                 |   174 +
 sys/dev/pcmcia/pcmcia.c                |     7 +-
 sys/dev/pcmcia/pcmciachip.h            |     6 +-
 33 files changed, 8240 insertions(+), 54 deletions(-)

diffs (truncated from 8821 to 300 lines):

diff -r 28c3267c4143 -r f9ecb47a393a sys/arch/i386/conf/CARDBUS
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Fri Oct 15 06:07:17 1999 +0000
@@ -0,0 +1,652 @@
+#      $NetBSD: CARDBUS,v 1.1 1999/10/15 06:10:38 haya Exp $
+#
+#      CARDBUS -- GENERIC + CardBus support
+#
+
+include "arch/i386/conf/std.i386"
+
+maxusers       32              # estimated number of users
+
+# CPU support.  At least one is REQUIRED.
+options        I386_CPU
+options        I486_CPU
+options        I586_CPU
+options        I686_CPU
+
+# CPU-related options.
+options        MATH_EMULATE    # floating point emulation
+#options       VM86            # virtual 8086 emulation
+options        USER_LDT        # user-settable LDT; used by WINE
+# eliminate delay no-ops in I/O; recommended on all but very old machines
+#options       DUMMY_NOPS
+
+# delay between "rebooting ..." message and hardware reset, in milliseconds
+#options       CPURESET_DELAY=2000
+
+# Misc. i386-specific options
+options        XSERVER         # X server support in console drivers
+#options       XSERVER_DDB     # PF12 gets you into DDB when X is running
+
+# This option allows you to force a serial console at the specified
+# I/O address.   see console(4) for details.
+#options       "CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
+#      you don't want the option below ON iff you are using the
+#      serial console option of the new boot strap code.
+#options       CONS_OVERRIDE   # Always use above! independent of boot info
+
+# The following options override the memory sizes passed in from the boot
+# block.  Use them *only* if the boot block is unable to determine the correct
+# values.  Note that the BIOS may *correctly* report less than 640k of base
+# memory if the extended BIOS data area is located at the top of base memory
+# (as is the case on most recent systems).
+#options       REALBASEMEM=639         # size of base memory (in KB)
+#options       REALEXTMEM=15360        # size of extended memory (in KB)
+
+# Standard system options
+
+options        UCONSOLE        # users can use TIOCCONS (for xconsole)
+options        INSECURE        # disable kernel security levels
+
+options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
+options        NTP             # NTP phase/frequency locked loop
+
+options        KTRACE          # system call tracing via ktrace(1)
+
+options        SYSVMSG         # System V-like message queues
+options        SYSVSEM         # System V-like semaphores
+options        SYSVSHM         # System V-like memory sharing
+#options       SHMMAXPGS=1024  # 1024 pages is the default
+
+options        LKM             # loadable kernel modules
+
+# Diagnostic/debugging support options
+options        DIAGNOSTIC      # cheap kernel consistency checks
+#options       DEBUG           # expensive debugging checks/support
+#options       KMEMSTATS       # kernel memory statistics (vmstat -m)
+options        DDB             # in-kernel debugger
+#options       DDB_HISTORY_SIZE=100    # enable history editing in DDB
+#options       KGDB            # remote debugger
+#options       "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
+#makeoptions   DEBUG="-g"      # compile full symbol table
+
+# Compatibility options
+options        COMPAT_NOMID    # compatibility with 386BSD, BSDI, NetBSD 0.8,
+options        COMPAT_09       # NetBSD 0.9,
+options        COMPAT_10       # NetBSD 1.0,
+options        COMPAT_11       # NetBSD 1.1,
+options        COMPAT_12       # NetBSD 1.2,
+options        COMPAT_13       # NetBSD 1.3,
+options        COMPAT_43       # and 4.3BSD
+options        COMPAT_386BSD_MBRPART # recognize old partition ID
+
+options        COMPAT_SVR4     # binary compatibility with SVR4
+options        COMPAT_IBCS2    # binary compatibility with SCO and ISC
+options        COMPAT_LINUX    # binary compatibility with Linux
+options        COMPAT_FREEBSD  # binary compatibility with FreeBSD
+
+# Executable format options
+options        EXEC_ELF32      # 32-bit ELF executables (SVR4, Linux)
+
+# File systems
+file-system    FFS             # UFS
+file-system    EXT2FS          # second extended file system (linux)
+file-system    LFS             # log-structured file system
+file-system    MFS             # memory file system
+file-system    NFS             # Network File System client
+file-system    CD9660          # ISO 9660 + Rock Ridge file system
+file-system    MSDOSFS         # MS-DOS file system
+file-system    FDESC           # /dev/fd
+file-system    KERNFS          # /kern
+file-system    NULLFS          # loopback file system
+file-system    PORTAL          # portal filesystem (still experimental)
+file-system    PROCFS          # /proc
+file-system    UMAPFS          # NULLFS + uid and gid remapping
+file-system    UNION           # union file system
+file-system    CODA            # Coda File System; also needs vcoda (below)
+
+# File system options
+options        QUOTA           # UFS quotas
+#options       FFS_EI          # FFS Endian Independant support
+options        NFSSERVER       # Network File System server
+#options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+                               # immutable) behave as system flags.
+
+# Networking options
+#options       GATEWAY         # packet forwarding
+options        INET            # IP + ICMP + TCP + UDP
+#options       MROUTING        # IP multicast routing
+options        NS              # XNS
+#options       NSIP            # XNS tunneling over IP
+options        ISO,TPIP        # OSI
+options        EON             # OSI tunneling over IP
+options        CCITT,LLC,HDLC  # X.25
+options        NETATALK        # AppleTalk networking protocols
+#options       PPP_BSDCOMP     # BSD-Compress compression support for PPP
+#options       PPP_DEFLATE     # Deflate compression support for PPP
+#options       PPP_FILTER      # Active filter support for PPP (requires bpf)
+#options       PFIL_HOOKS      # pfil(9) packet filter hooks
+#options       IPFILTER_LOG    # ipmon(8) log support
+
+# Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
+#options       TCP_COMPAT_42
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+options        EISAVERBOSE     # verbose EISA device autoconfig messages
+options        PCIVERBOSE      # verbose PCI device autoconfig messages
+#options       PCMCIAVERBOSE   # verbose PCMCIA configuration messages
+options        SCSIVERBOSE     # human readable SCSI error messages
+options        USBVERBOSE      # verbose USB device autoconfig messages
+
+options        NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
+
+#
+# wscons options
+#
+# builtin terminal emulations
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+# different kernel output - see dev/wscons/wsdisplayvar.h
+options        WS_KERNEL_FG=WSCOL_GREEN
+#options       WS_KERNEL_BG=WSCOL_BLACK
+# compatibility to other console drivers
+options        WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
+options        WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
+options        WSDISPLAY_COMPAT_USL            # VT handling
+options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
+# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+# allocate a number of virtual screens at autoconfiguration time
+#options       WSDISPLAY_DEFAULTSCREENS=4
+
+# Kernel root file system and dump configuration.
+config         netbsd  root on ? type ?
+#config                netbsd  root on sd0a type ffs
+#config                netbsd  root on ? type nfs
+
+#
+# Device configuration
+#
+
+mainbus0 at root
+
+#apm0  at mainbus0                     # Advanced power management
+
+
+# Basic Bus Support
+
+# PCI bus support
+pci*   at mainbus? bus ?
+pci*   at pchb? bus ?
+pci*   at ppb? bus ?
+
+# PCI bridges
+pchb*  at pci? dev ? function ?        # PCI-Host bridges
+pceb*  at pci? dev ? function ?        # PCI-EISA bridges
+pcib*  at pci? dev ? function ?        # PCI-ISA bridges
+ppb*   at pci? dev ? function ?        # PCI-PCI bridges
+# XXX 'puc's aren't really bridges, but there's no better place for them here
+puc*   at pci? dev ? function ?        # PCI "universal" comm. cards
+
+# EISA bus support
+eisa*  at mainbus?
+eisa*  at pceb?
+
+# ISA bus support
+isa*   at mainbus?
+isa*   at pceb?
+isa*   at pcib?
+
+# PCMCIA bus support
+pcmcia*        at pcic? controller ? socket ?
+pcmcia*        at tcic? controller ? socket ?
+
+# ISA PCMCIA controllers
+pcic0  at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
+pcic1  at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
+tcic0  at isa? port 0x240 iomem 0xd0000 iosiz 0x4000
+
+# PCI PCMCIA controllers
+pcic0  at pci? dev? function ?
+
+# ISA Plug-and-Play bus support
+isapnp0        at isa?
+
+# ISA Plug-and-Play PCMCIA controllers
+pcic*  at isapnp?
+
+# CardBus bus support
+cardbus*       at cardslot?
+pcmcia*                at cardslot?
+
+cbb*   at pci? dev? function ?
+
+cardslot*      at cbb? 
+
+# Coprocessor Support
+
+# Math Coprocessor support
+npx0   at isa? port 0xf0 irq 13        # x86 math coprocessor
+
+
+# Console Devices
+
+# ISA console.  You can only configure one of these!
+#pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver
+#vt0   at isa? port 0x60 irq 1         # PCVT console driver
+
+# Keyboard layout configuration for pccons
+#options       FRENCH_KBD
+#options       FINNISH_KBD
+#options       GERMAN_KBD
+#options       NORWEGIAN_KBD
+
+# wscons
+pckbc0 at isa?                 # pc keyboard controller
+pckbd* at pckbc?               # PC keyboard
+# "opms" should not be enabled together with "pms" or "pmsi"
+#pms*          at pckbc?               # PS/2 mouse for wsmouse
+#pmsi*         at pckbc?       # PS/2 "Intelli"mouse for wsmouse
+opms*          at pckbc?               # backwards compatible PS/2 mouse
+vga0           at isa?
+vga*           at pci?
+pcdisplay0     at isa?                 # CGA, MDA, EGA, HGA
+wsdisplay*     at vga? console ?
+wsdisplay*     at pcdisplay? console ?
+wskbd* at pckbd? console ?
+#wsmouse*      at pms?
+#wsmouse*      at pmsi?
+
+pcppi0 at isa?
+sysbeep0       at pcppi?
+
+# Serial Devices
+
+# PCI serial interfaces
+com*   at puc? port ?                  # 16x450s on "universal" comm boards
+cy*    at pci? dev ? function ?        # Cyclades Cyclom-Y serial boards
+
+# ISA Plug-and-Play serial interfaces
+com*   at isapnp?                      # Modems and serial boards
+
+# PCMCIA serial interfaces
+com*   at pcmcia? function ?           # Modems and serial cards
+
+pcmcom*        at pcmcia? function ?           # PCMCIA multi-port serial cards
+com*   at pcmcom? slave ?              # ...and the slave devices
+
+# ISA serial interfaces
+#options       COM_HAYESP              # adds Hayes ESP serial board support
+com0   at isa? port 0x3f8 irq 4        # Standard PC serial ports
+com1   at isa? port 0x2f8 irq 3
+com2   at isa? port 0x3e8 irq 5
+#com3  at isa? port 0x2e8 irq 9
+#ast0  at isa? port 0x1a0 irq 5        # AST 4-port serial cards
+#com*  at ast? slave ?
+#boca0 at isa? port 0x100 irq 5        # BOCA 8-port serial cards
+#com*  at boca? slave ?
+#tcom0 at isa? port 0x100 irq 7        # TC-800 8-port serial cards
+#com*  at tcom? slave ?
+#rtfps0        at isa? port 0x1230 irq 10      # RT 4-port serial cards
+#com*  at rtfps? slave ?
+#cy0   at isa? iomem 0xd4000 irq 12    # Cyclades serial cards
+
+
+# Parallel Printer Interfaces
+



Home | Main Index | Thread Index | Old Index