Add slhci at pcmcia.

And reorder.
This commit is contained in:
kiyohara 2007-08-21 02:48:14 +00:00
parent e066a10613
commit 510dbbae54
10 changed files with 58 additions and 24 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.316 2007/08/20 00:54:41 kiyohara Exp $
# $NetBSD: GENERIC,v 1.317 2007/08/21 02:48:14 kiyohara Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
ident "GENERIC-$Revision: 1.316 $"
ident "GENERIC-$Revision: 1.317 $"
maxusers 32
@ -535,10 +535,14 @@ fd* at fdc? drive ?
ld* at cac? unit ?
ld* at mlx? unit ?
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
usb* at uhci?
usb* at ohci?
usb* at ehci?
usb* at ohci?
usb* at slhci?
usb* at uhci?
# USB Hubs
uhub* at usb?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.156 2007/08/20 00:54:41 kiyohara Exp $
# $NetBSD: GENERIC,v 1.157 2007/08/21 02:48:14 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.156 $"
#ident "GENERIC-$Revision: 1.157 $"
maxusers 32 # estimated number of users
@ -674,6 +674,9 @@ uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# ISA USB controllers
#slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
usb* at ehci?
usb* at ohci?

View File

@ -1,4 +1,4 @@
# $NetBSD: ALL,v 1.117 2007/08/20 00:54:41 kiyohara Exp $
# $NetBSD: ALL,v 1.118 2007/08/21 02:48:15 kiyohara Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "ALL-$Revision: 1.117 $"
#ident "ALL-$Revision: 1.118 $"
maxusers 32 # estimated number of users
@ -1050,12 +1050,15 @@ uhci* at cardbus? function ? # Universal Host Controller (Intel)
# ISA USB controllers
slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
usb* at ehci?
usb* at gcscehci?
usb* at ohci?
usb* at uhci?
usb* at slhci?
usb* at uhci?
# USB Hubs
uhub* at usb?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.842 2007/08/20 00:54:42 kiyohara Exp $
# $NetBSD: GENERIC,v 1.843 2007/08/21 02:48:15 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.842 $"
#ident "GENERIC-$Revision: 1.843 $"
maxusers 32 # estimated number of users
@ -1049,12 +1049,15 @@ uhci* at cardbus? function ? # Universal Host Controller (Intel)
# ISA USB controllers
#slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
usb* at ehci?
usb* at gcscehci?
usb* at ohci?
usb* at slhci?
usb* at uhci?
#usb* at slhci?
# USB Hubs
uhub* at usb?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_LAPTOP,v 1.240 2007/08/20 00:54:42 kiyohara Exp $
# $NetBSD: GENERIC_LAPTOP,v 1.241 2007/08/21 02:48:15 kiyohara Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.240 $"
#ident "GENERIC-$Revision: 1.241 $"
maxusers 32 # estimated number of users
@ -707,9 +707,13 @@ ehci* at cardbus? function ? # Enhanced Host Controller
ohci* at cardbus? function ? # Open Host Controller
uhci* at cardbus? function ? # Universal Host Controller (Intel)
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
usb* at ehci?
usb* at ohci?
usb* at slhci?
usb* at uhci?
# USB Hubs

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.40 2007/08/20 00:54:42 kiyohara Exp $
# $NetBSD: GENERIC,v 1.41 2007/08/21 02:48:15 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.40 $"
#ident "GENERIC-$Revision: 1.41 $"
maxusers 32 # estimated number of users
@ -518,6 +518,9 @@ uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# ISA USB controllers
#slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
#usb* at ehci?
usb* at ohci?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.258 2007/06/11 13:39:22 kiyohara Exp $
# $NetBSD: GENERIC,v 1.259 2007/08/21 02:48:16 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.258 $"
#ident "GENERIC-$Revision: 1.259 $"
maxusers 32
@ -455,8 +455,11 @@ ehci* at pci? dev ? function ? # USB Enhanced Host Controller
ohci* at cardbus? function ? # USB Open Host Controller
ehci* at cardbus? function ? # USB Enhanced Host Controller
usb* at ohci? # USB bus support
slhci* at pcmcia? function ? # ScanLogic SL811HS
usb* at ehci? # USB bus support
usb* at ohci? # USB bus support
usb* at slhci? # USB bus support
uhub* at usb? # USB Hubs
uhub* at uhub? port ?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.135 2007/06/04 08:55:24 martin Exp $
# $NetBSD: GENERIC,v 1.136 2007/08/21 02:48:16 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.135 $"
#ident "GENERIC-$Revision: 1.136 $"
maxusers 32
@ -407,9 +407,13 @@ ukphy* at mii? phy ? # generic unknown PHYs
#uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
#ohci* at pci? dev ? function ? # Open Host Controller
# PCMCIA USB controllers
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
#usb* at uhci?
#usb* at ohci?
#usb* at slhci?
# USB Hubs
#uhub* at usb?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.89 2007/08/20 00:54:43 kiyohara Exp $
# $NetBSD: GENERIC,v 1.90 2007/08/21 02:48:16 kiyohara Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.89 $"
#ident "GENERIC-$Revision: 1.90 $"
maxusers 64
@ -535,6 +535,9 @@ ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# PCMCIA USB controllers
#slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
usb* at ehci?
usb* at ohci?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.7 2007/07/29 14:31:23 nonaka Exp $
# $NetBSD: GENERIC,v 1.8 2007/08/21 02:48:16 kiyohara Exp $
#
# GENERIC machine description file
#
@ -239,8 +239,12 @@ wd* at atabus? drive ? flags 0x0000
pxaudc0 at pxaip? # USB Device Controller
#ohci0 at pxaip? # USB Host Controller
# PCMCIA USB controllers
#slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
#usb* at ohci?
#usb* at slhci?
# USB Hubs
#uhub* at usb?