Menu
▾
▴
linux-mips-commits — CVS Commit Patches
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(165) |
Sep
(240) |
Oct
(424) |
Nov
(526) |
Dec
(293) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(242) |
Feb
(149) |
Mar
(143) |
Apr
(143) |
May
(76) |
Jun
(59) |
Jul
(20) |
Aug
(2) |
Sep
(49) |
Oct
(1) |
Nov
(4) |
Dec
|
| 2003 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(72) |
Jul
(36) |
Aug
(9) |
Sep
(16) |
Oct
(23) |
Nov
(9) |
Dec
(3) |
| 2010 |
Jan
|
Feb
(1) |
Mar
(35) |
Apr
(44) |
May
(56) |
Jun
(71) |
Jul
(41) |
Aug
(41) |
Sep
(22) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
(25) |
Oct
(105) |
Nov
(15) |
Dec
|
| 2025 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:19:18
|
Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/char
Modified Files:
Config.in Makefile
Log Message:
Sync with OSS 2.4.13.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Config.in 2001/11/06 00:30:43 1.19
+++ Config.in 2001/11/06 02:57:37 1.20
@@ -161,6 +161,7 @@
tristate ' Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG
tristate ' Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT
tristate ' Advantech SBC Watchdog Timer' CONFIG_ADVANTECH_WDT
+ tristate ' IB700 SBC Watchdog Timer' CONFIG_IB700_WDT
tristate ' SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
tristate ' W83877F (EMACS) Watchdog Timer' CONFIG_W83877F_WDT
tristate ' Mixcom Watchdog' CONFIG_MIXCOMWD
@@ -211,6 +212,9 @@
if [ "$CONFIG_FTAPE" != "n" ]; then
source drivers/char/ftape/Config.in
fi
+
+tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
+
endmenu
dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile 2001/11/06 00:30:43 1.15
+++ Makefile 2001/11/06 02:57:37 1.16
@@ -230,6 +230,7 @@
obj-$(CONFIG_PCWATCHDOG) += pcwd.o
obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
+obj-$(CONFIG_IB700_WDT) += ib700wdt.o
obj-$(CONFIG_MIXCOMWD) += mixcomwd.o
obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
obj-$(CONFIG_WDT) += wdt.o
@@ -239,7 +240,13 @@
obj-$(CONFIG_I810_TCO) += i810-tco.o
obj-$(CONFIG_MACHZ_WDT) += machzwd.o
obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
-obj-$(CONFIG_VR41XX_WDT) += vr41xxwdt.c
+obj-$(CONFIG_SH_WDT) += shwdt.o
+obj-$(CONFIG_VR41XX_WDT) += vr41xxwdt.o
+
+subdir-$(CONFIG_MWAVE) += mwave
+ifeq ($(CONFIG_MWAVE),y)
+ obj-y += mwave/mwave.o
+endif
include $(TOPDIR)/Rules.make
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:19:17
|
Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv10490/arch/mips
Modified Files:
config.in
Log Message:
Sync with OSS 2.4.13.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- config.in 2001/11/05 17:06:55 1.46
+++ config.in 2001/11/06 02:57:37 1.47
@@ -472,7 +472,7 @@
if [ "$CONFIG_DECSTATION" != "y" -a \
"$CONFIG_SGI_IP22" != "y" ]; then
- source drivers/i2o/Config.in
+ source drivers/message/i2o/Config.in
fi
if [ "$CONFIG_NET" = "y" ]; then
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:19:15
|
Update of /cvsroot/linux-mips/linux/Documentation In directory usw-pr-cvs1:/tmp/cvs-serv10490/Documentation Modified Files: Configure.help Log Message: Sync with OSS 2.4.13. Index: Configure.help =================================================================== RCS file: /cvsroot/linux-mips/linux/Documentation/Configure.help,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Configure.help 2001/11/06 00:30:42 1.3 +++ Configure.help 2001/11/06 02:57:37 1.4 @@ -2568,6 +2568,31 @@ a module, say M here and read Documentation/modules.txt. If unsure, say N. +ACP Modem (Mwave) support +CONFIG_MWAVE + The ACP modem (Mwave) for Linux is a WinModem. It is composed of a + kernel driver and a user level application. Together these components + support direct attachment to public switched telephone networks (PSTNs) + and support selected world wide countries. + + This version of the ACP Modem driver supports the IBM Thinkpad 600E, + 600, and 770 that include on board ACP modem hardware. + + The modem also supports the standard communications port interface + (ttySx) and is compatible with the Hayes AT Command Set. + + The user level application needed to use this driver can be found at + the IBM Linux Technology Center (LTC) web site: + http://www.ibm.com/linux/ltc/ + + If you own one of the above IBM Thinkpads which has the Mwave chipset + in it, say Y. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called mwave.o. If you want to compile it as + a module, say M here and read Documentation/modules.txt. + /dev/agpgart (AGP Support) (EXPERIMENTAL) CONFIG_AGP AGP (Accelerated Graphics Port) is a bus system mainly used to @@ -7675,15 +7700,6 @@ Support for these adaptors is so far still incomplete and buggy. You have been warned. -Hermes PCMCIA card support -CONFIG_PCMCIA_HERMES - Enable support for PCMCIA 802.11b cards using the Hermes or Intersil - HFA384x (Prism 2) chipset. To use your PC-cards, you will need - supporting software from David Hinds' pcmcia-cs package (see the - file Documentation/Changes for location). You also want to check out - the PCMCIA-HOWTO, available from - http://www.linuxdoc.org/docs.html#howto . - Hermes support (Orinoco/WavelanIEEE/PrismII/Symbol 802.11b cards) CONFIG_PCMCIA_HERMES A driver for "Hermes" chipset based PCMCIA wireless adaptors, such @@ -8850,6 +8866,18 @@ module, say M here and read Documentation/modules.txt as well as Documentation/networking/net-modules.txt. +RealTek RTL-8139C+ 10/100 PCI Fast Ethernet Adapter support +CONFIG_8139CP + This is a driver for the Fast Ethernet PCI network cards based on + the RTL8139C+ chips. If you have one of those, say Y and read + the Ethernet-HOWTO, available from + http://www.linuxdoc.org/docs.html#howto . + + If you want to compile this driver as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read Documentation/modules.txt. This is recommended. + The module will be called 8139cp.o. + RealTek RTL-8139 PCI Fast Ethernet Adapter support CONFIG_8139TOO This is a driver for the Fast Ethernet PCI network cards based on @@ -11042,7 +11070,29 @@ of debug messages to the system log. Select this if you are having a problem with USB support and want to see more of what is going on. -UHCI (intel PIIX4, VIA, ...) support? +USB fetch large config +CONFIG_USB_LARGE_CONFIG + This option changes the initial request for a config descriptor so + that some poorly designed devices will still work. Some APC UPSes + need it. Basically, the usb subsystem sends a request for a short + (8 byte) config, just to find out how large the real config is. + Incorrectly implemented devices may choke on this small config + request. This option make the initial request for a quite large + config (1009 bytes), and things just work. + + If you have an APC UPS, say Y; otherwise say N. + +USB long timeout +CONFIG_USB_LONG_TIMEOUT + This option makes the standard time out a bit longer. Basically, + some devices are just slow to respond, so this makes usb more + patient. There should be no harm in selecting this, but it is + needed for some MGE Ellipse UPSes. + + If you have an MGE Ellipse UPS, or you see timeouts in HID + transactions, say Y; otherwise say N. + +UHCI (intel PIIX4, VIA, ...) support CONFIG_USB_UHCI The Universal Host Controller Interface is a standard by Intel for accessing the USB hardware in the PC (which is also called the USB @@ -11118,6 +11168,20 @@ The module will be called hid.o. If you want to compile it as a module, say M here and read Documentation/modules.txt. +/dev/usb/hiddev raw HID device support +CONFIG_USB_HIDDEV + Say Y here if you want to support HID devices (from the USB + specification standpoint) that aren't strictly user interface + devices, like monitor controls and Uninterruptable Power Supplies. + It is also used for "consumer keys" on multimedia keyboards and + USB speakers. + + This module supports these devices separately using a separate + event interface on /dev/usb/hiddevX (char 180:96 to 180:111). + This driver requires CONFIG_USB_HID. + + If unsure, say N. + USB HIDBP Keyboard (basic) support CONFIG_USB_KBD Say Y here if you don't want to use the generic HID driver for your @@ -11376,8 +11440,7 @@ and was developed with their support. You must also include firmware to support your particular device(s). - See http://www.linuxcare.com.au/hugh/keyspan.html for - more information. + See http://misc.nu/hugh/keyspan.html for more information. This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). @@ -11391,6 +11454,20 @@ USB Keyspan USA-28X Firmware CONFIG_USB_SERIAL_KEYSPAN_USA28X Say Y here to include firmware for the USA-28X converter. + Be sure you have a USA-28X, there are also 28XA and 28XB + models, the label underneath has the actual part number. + +USB Keyspan USA-28XA Firmware +CONFIG_USB_SERIAL_KEYSPAN_USA28XA + Say Y here to include firmware for the USA-28XA converter. + Be sure you have a USA-28XA, there are also 28X and 28XB + models, the label underneath has the actual part number. + +USB Keyspan USA-28XB Firmware +CONFIG_USB_SERIAL_KEYSPAN_USA28XB + Say Y here to include firmware for the USA-28XB converter. + Be sure you have a USA-28XB, there are also 28X and 28XA + models, the label underneath has the actual part number. USB Keyspan USA-19 Firmware CONFIG_USB_SERIAL_KEYSPAN_USA19 @@ -11601,26 +11678,14 @@ The module will be called se401.o. If you want to compile it as a module, say M here and read Documentation/modules.txt. -USB ADMtek Pegasus-based ethernet device support +Pegasus/Pegasus II based USB-Ethernet device support CONFIG_USB_PEGASUS - Say Y if you want to use your USB ethernet device. Supported - cards until now are: - ADMtek AN986 Pegasus (eval. board) - ADMtek ADM8511 Pegasus II (eval. board) - Accton 10/100 - Billington USB-100 - Corega FEter USB-TX - MELCO/BUFFALO LUA-TX - D-Link DSB-650TX, DSB-650TX-PNA, DSB-650, DU-E10, DU-E100 - Linksys USB100TX, USB10TX - LANEED Ethernet LD-USB/TX - SMC 202 - SOHOware NUB Ethernet - - Any Pegasus II based board also are supported. - If you have devices with vendor IDs other than noted above - you should add them in the driver code and send a message - to me (pe...@dc...) for update. + Say Y here if you know you have Pegasus or Pegasus II based adapter. + If in doubt then look at linux/drivers/usb/pegasus.h for the complete + list of supported devices. + If your particular adapter is not in the list and you are _sure_ it + is Pegasus or Pegasus II based then send me (pma...@ln...) vendor + and device IDs. This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). @@ -11702,6 +11767,10 @@ The module will be called CDCEther.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. +NetChip 1080-based USB Host-to-Host Link +CONFIG_USB_NET1080 + The NetChip 1080 is a USB 1.1 host controller. NetChip has a web + site with technical information at http://www.netchip.com/ . USB Kodak DC-2xx Camera support CONFIG_USB_DC2XX @@ -11886,6 +11955,12 @@ and work. SANE 1.0.4 or newer is needed to make use of your scanner. This driver can be compiled as a module. +HP 53xx and Minolta Dual Scanner support +CONFIG_USB_HPUSBSCSI + Say Y here if you want support for the HP 53xx series of scanners + and the Minolta Scan Dual. This driver is experimental. + The scanner will be accessible as a SCSI device. + USB Bluetooth support CONFIG_USB_BLUETOOTH Say Y here if you want to connect a USB Bluetooth device to your @@ -14868,6 +14943,17 @@ The module is called machzwd.o. If you want to compile it as a module, say M here and read Documentation/modules.txt. +SuperH 3/4 Watchdog +CONFIG_SH_WDT + This driver adds watchdog support for the integrated watchdog in the + SuperH 3 and 4 processors. If you have one of these processors, say Y, + otherwise say N. + + This driver is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module is called shwdt.o. If you want to compile it as a module, + say M here and read Documentation/modules.txt. + NEC VR41xx Watchdog (DSU) CONFIG_VR41XX_WDT This is a driver for the hardware watchdog integrated in the NEC VR41xx @@ -16667,6 +16753,121 @@ found on many Sun machines. Note that many of the newer Ultras actually have pc style hardware instead. +# The following options are for Linux when running on the Hitachi +# SuperH family of RISC microprocessors. + +CPU Selection +CONFIG_CPU_SUBTYPE_SH7707 + This is the type of your Hitachi SuperH processor. This information is + used for optimizing and configuration purposes. + + - "SH7707" for SH7707 + - "SH7708" for SH7708, SH7708S, SH7708R + - "SH7709" for SH7707, SH7709, SH7709A, and SH7729. + - "SH7750" for SH7750, SH7750S + - "SH7751" for SH7751 + - "ST40STB1" for ST40STB1 + +Target machine selection +CONFIG_SH_GENERIC + This is machine type of your target. + + - "Generic" for Generic kernel which might support all of them + - "SolutionEngine" for Hitachi SolutionEngine (7709A, 7750, 7750S) + - "SolutionEngine7751" for Hitachi SolutionEngine (7751) + - "STB1_Harp" for STMicroelectronics HARP + - "STB1_Overdrive" for STMicroelectronics Overdrive + - "HP620" for HP 'Jornada' 620 + - "HP680" for HP 'Jornada' 680 + - "HP690" for HP 'Jornada' 690 + - "CqREEK" for CQ Publishing CqREEK SH-4 + - "DMIDA" for DMIDA, industrial data assistant + - "EC3104" for Compaq Aero 8000 + - "Dreamcast" for SEGA Dreamcast + - "CAT68701" for CAT 68701 Evaluation Board (SH7708) + - "BigSur" for Big Sur Evaluation Board + - "SH2000" for SH2000 Evaluation Board (SH7709A) + - "ADX" for A&D ADX + - "BareCPU" for Bare CPU board such as CqREEK SH-3 + + If unsure, select "BareCPU". + +Physical memory start address +CONFIG_MEMORY_START + Computers built with Hitachi SuperH processors always + map the ROM starting at address zero. But the processor + does not specify the range that RAM takes. RAM is usually + mapped starting at 0c000000, but it may be elsewhere. + + You should set this value to the address of the lowest + RAM location. + + A value of 0c000000 will work for most boards. + +Directly Connected Compact Flash support +CONFIG_CF_ENABLER + If your board has "Directly Connected" CompactFlash at area 5 or 6, + you may want to enable this option. Then, you can use CF as + primary IDE drive (only tested for SanDisk). + + If in doubt, press "n". + +SuperH RTC support +CONFIG_SH_RTC + Selecting this option will allow the Linux kernel to emulate + PC's RTC. + + If unsure, say N. + +SuperH DMAC support +CONFIG_SH_DMA + Selecting this option will provide same API as PC's Direct Memory + Access Controller(8237A) for SuperH DMAC. + + If unsure, say N. + +SuperH SCI (serial) support +CONFIG_SH_SCI + Selecting this option will allow the Linux kernel to transfer + data over SCI (Serial Communication Interface) and/or SCIF + which are built into the Hitachi SuperH processor. + + If unsure, say N. + +Use LinuxSH standard BIOS +CONFIG_SH_STANDARD_BIOS + Say Y here if your target has the gdb-sh-stub package from + www.m17n.org (or any conforming standard LinuxSH BIOS) in FLASH + or EPROM. The kernel will use standard BIOS calls during boot + for various housekeeping tasks. Note this does not work with + WindowsCE machines. If unsure, say N. + +Early printk support +CONFIG_SH_EARLY_PRINTK + If you say Y here, the kernel printk routine will begin output to + the console much earlier in the boot process, before the serial + console is initialised, instead of buffering output. Standard + LinuxSH BIOS calls are used for the output. This helps when + debugging fatal problems early in the boot sequence. This is only + useful for kernel hackers. If unsure, say N. + +National Semiconductor DP83902AV 'ST-NIC' support +CONFIG_STNIC + If you have a network adaptor with National Semiconductor DP83902AV, + say Y or M (for module). + + If unsure, say N. + +CompactFlash Connection Area +CONFIG_CF_AREA5 + If your board has "Directly Connected" CompactFlash, You should + select the area where your CF is connected to. + + - "Area5" if CompactFlash is connected to Area 5 (0x14000000) + - "Area6" if it is connected to Area 6 (0x18000000) + + "Area6" will work for most boards. For ADX, select "Area5". + # # m68k-specific kernel options # Documented by Chris Lawrence <qu...@th...> et al. @@ -18219,6 +18420,11 @@ It is also possible to say M here to build it as a module (ds1620.o) It is recommended to be used on a NetWinder, but it is not a necessity. + +Debug high memory support +CONFIG_DEBUG_HIGHMEM + This options enables addition error checking for high memory systems. + Disable for production systems. Verbose kernel error messages CONFIG_DEBUG_ERRORS |
|
From: Paul M. <le...@us...> - 2001-11-06 09:18:46
|
Update of /cvsroot/linux-mips/linux In directory usw-pr-cvs1:/tmp/cvs-serv10490 Modified Files: Makefile Log Message: Sync with OSS 2.4.13. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 2001/11/06 00:43:16 1.10 +++ Makefile 2001/11/06 02:57:37 1.11 @@ -1,11 +1,12 @@ VERSION = 2 PATCHLEVEL = 4 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = -mips KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) ARCH = mips +KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//") CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ @@ -176,7 +177,7 @@ DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o -DRIVERS-$(CONFIG_I2O) += drivers/i2o/i2o.o +DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o |
|
From: Paul M. <le...@us...> - 2001-11-06 09:18:46
|
Update of /cvsroot/linux-mips/linux/arch/mips64
In directory usw-pr-cvs1:/tmp/cvs-serv10490/arch/mips64
Modified Files:
config.in
Log Message:
Sync with OSS 2.4.13.
Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.in 2001/10/27 17:28:54 1.5
+++ config.in 2001/11/06 02:57:37 1.6
@@ -191,7 +191,7 @@
fi
endmenu
-source drivers/i2o/Config.in
+#source drivers/message/i2o/Config.in
if [ "$CONFIG_NET" = "y" ]; then
mainmenu_option next_comment
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:18:45
|
Update of /cvsroot/linux-mips/linux/drivers/i2c In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/i2c Modified Files: Makefile Log Message: Sync with OSS 2.4.13. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/i2c/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 2001/10/22 19:16:45 1.2 +++ Makefile 2001/11/06 02:57:37 1.3 @@ -4,7 +4,8 @@ O_TARGET := i2c.o -export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o i2c-algo-ite.o +export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \ + i2c-algo-ite.o i2c-dev.o obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o @@ -16,6 +17,7 @@ obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o obj-$(CONFIG_ITE_I2C_ALGO) += i2c-algo-ite.o obj-$(CONFIG_ITE_I2C_ADAP) += i2c-adap-ite.o +obj-$(CONFIG_I2C_PROC) += i2c-proc.o # This is needed for automatic patch generation: sensors code starts here # This is needed for automatic patch generation: sensors code ends here |
|
From: Paul M. <le...@us...> - 2001-11-06 09:18:28
|
Update of /cvsroot/linux-mips/linux/drivers/sound In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/sound Modified Files: nec_vrc5477.c Log Message: Sync with OSS 2.4.13. Index: nec_vrc5477.c =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/sound/nec_vrc5477.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- nec_vrc5477.c 2001/10/22 19:16:45 1.4 +++ nec_vrc5477.c 2001/11/06 02:57:38 1.5 @@ -69,7 +69,7 @@ #include <linux/sched.h> #include <linux/delay.h> #include <linux/sound.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/init.h> |
|
From: Paul M. <le...@us...> - 2001-11-06 09:18:28
|
Update of /cvsroot/linux-mips/linux/drivers/pci In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/pci Modified Files: pci.ids Log Message: Sync with OSS 2.4.13. Index: pci.ids =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/pci/pci.ids,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- pci.ids 2001/11/06 00:30:46 1.7 +++ pci.ids 2001/11/06 02:57:38 1.8 @@ -106,9 +106,16 @@ 0012 53c895a 0020 53c1010 Ultra3 SCSI Adapter 0021 53c1010 66MHz Ultra3 SCSI Adapter + 0030 53c1030 + 0040 53c1035 008f 53c875J 1092 8000 FirePort 40 SCSI Controller 1092 8760 FirePort 40 Dual SCSI Host Adapter + 0621 FC909 + 0622 FC929 + 0623 FC929 LAN + 0624 FC919 + 0625 FC919 LAN 0701 83C885 0702 Yellowfin G-NIC gigabit ethernet 1318 0000 PEI100X @@ -2087,6 +2094,7 @@ 110a Siemens Nixdorf AG 0002 Pirahna 2-port 0005 Tulip controller, power management, switch extender + 2102 DSCC4 WAN adapter 4942 FPGA I-Bus Tracer for MBD 6120 SZB6120 110b Chromatic Research Inc. @@ -2312,7 +2320,7 @@ 1148 5841 FDDI SK-5841 (SK-NET FDDI-FP64) 1148 5843 FDDI SK-5843 (SK-NET FDDI-LP64) 1148 5844 FDDI SK-5844 (SK-NET FDDI-LP64 DAS) - 4200 Token ring adaptor + 4200 Token Ring adapter 4300 Gigabit Ethernet 1148 9821 SK-9821 (1000Base-T single link) 1148 9822 SK-9822 (1000Base-T dual link) @@ -3109,34 +3117,104 @@ 0396 SDRAM controller 0397 BIOS scratchpad 127a Rockwell International - 1002 HCF 56k V90 FaxModem - 127a 1002 HCF 56k V90 Modem - 1003 HCF 56k V90 FaxModem - 127a 1003 PCI56RX Modem - 13df 1003 PCI56RX Modem - 1004 HCF 56k V90 FaxModem - 1005 HCF 56k V90 FaxModem - 122d 4008 MDP3858SP-A SVD Modem - 127a 1005 PCI56RVP Modem - 13df 1005 PCI56RVP Modem - 1436 1005 WS-5614PS3G - 1025 HCF 56k PCI Modem - 127a 1025 HCF 56k PCI Modem + 1002 HCF 56k Data/Fax Modem + 122d 4002 HPG / MDP3858-U # Aztech + 122d 4005 MDP3858-E # Aztech + 122d 4007 MDP3858-A/-NZ # Aztech + 122d 4012 MDP3858-SA # Aztech + 122d 4017 MDP3858-W # Aztech + 122d 4018 MDP3858-W # Aztech + 1003 HCF 56k Data/Fax Modem + 0e11 b0bc 229-DF Zephyr # Compaq + 0e11 b114 229-DF Cheetah # Compaq + 1033 802b 229-DF # NEC + 13df 1003 PCI56RX Modem # E-Tech Inc + 13e0 0117 IBM # GVC + 13e0 0147 IBM # GVC + 13e0 0197 IBM # GVC + 13e0 01c7 IBM # GVC + 13e0 01f7 IBM # GVC + 1436 1003 IBM # CIS + 1436 1103 IBM # CIS + 1436 1602 Compaq 229-DF Ducati + 1004 HCF 56k Data/Fax/Voice Modem + 10cf 1059 Fujitsu 229-DFRT + 1005 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 1033 8029 229-DFSV # NEC + 1033 8054 Modem # NEC + 10cf 103c Fujitsu + 10cf 1055 Fujitsu 229-DFSV + 10cf 1056 Fujitsu 229-DFSV + 122d 4003 MDP3858SP-U # Aztech + 122d 4006 Packard Bell MDP3858V-E # Aztech + 122d 4008 MDP3858SP-A/SP-NZ # Aztech + 122d 4009 MDP3858SP-E # Aztech + 122d 4010 MDP3858V-U # Aztech + 122d 4011 MDP3858SP-SA # Aztech + 122d 4013 MDP3858V-A/V-NZ # Aztech + 122d 4015 MDP3858SP-W # Aztech + 122d 4016 MDP3858V-W # Aztech + 122d 4019 MDP3858V-SA # Aztech + 13df 1005 PCI56RVP Modem # E-Tech Inc + 13e0 0187 IBM # GVC + 13e0 01a7 IBM # GVC + 13e0 01b7 IBM # GVC + 13e0 01d7 IBM # GVC + 1436 1005 IBM # CIS + 1436 1105 IBM # CIS + 1023 HCF 56k Data/Fax Modem + 122d 4020 Packard Bell MDP3858-WE # Aztech + 122d 4023 MDP3858-UE # Aztech + 13e0 0247 IBM # GVC + 13e0 0297 IBM # GVC + 13e0 02c7 IBM # GVC + 1436 1203 IBM # CIS + 1436 1303 IBM # CIS + 1024 HCF 56k Data/Fax/Voice Modem + 1025 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 10cf 106a Fujitsu 235-DFSV + 122d 4021 Packard Bell MDP3858V-WE # Aztech + 122d 4022 MDP3858SP-WE # Aztech + 122d 4024 MDP3858V-UE # Aztech + 122d 4025 MDP3858SP-UE # Aztech 1026 HCF 56k PCI Speakerphone Modem - 127a 1026 HCF 56k PCI Speakerphone Modem 1035 HCF 56k PCI Speakerphone Modem - 127a 1035 HCF 56k PCI Speakerphone Modem - 1085 Volcano HCF 56k PCI Modem - 127a 1085 Volcano HCF 56k PCI Modem - 2005 HCF 56k V90 FaxModem - 127a 2005 Conexant SoftK56 Speakerphone Modem - 2015 Conexant SoftK56 Speakerphone Modem - 127a 2015 Conexant SoftK56 Speakerphone Modem - 14c8 2115 Conexant SoftK56 Speakerphone Modem + 1085 HCF 56k Volcano PCI Modem + 2005 HCF 56k Data/Fax Modem + 104d 8044 229-DFSV # Sony + 104d 8045 229-DFSV # Sony + 104d 8055 PBE/Aztech 235W-DFSV # Sony + 104d 8056 235-DFSV # Sony + 104d 805a Modem # Sony + 104d 805f Modem # Sony + 104d 8074 Modem # Sony + 2013 HSF 56k Data/Fax Modem + 1179 0001 Modem # Toshiba + 1179 ff00 Modem # Toshiba + 2014 HSF 56k Data/Fax/Voice Modem + 10cf 1057 Fujitsu Citicorp III + 122d 4050 MSP3880-U # Aztech + 122d 4055 MSP3880-W # Aztech + 2015 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 10cf 1063 Fujitsu + 10cf 1064 Fujitsu + 1468 2015 Fujitsu + 2016 HSF 56k Data/Fax/Voice/Spkp Modem + 122d 4051 MSP3880V-W # Aztech + 122d 4052 MSP3880SP-W # Aztech + 122d 4054 MSP3880V-U # Aztech + 122d 4056 MSP3880SP-U # Aztech + 122d 4057 MSP3880SP-A # Aztech + 4311 Riptide HSF 56k PCI Modem + 127a 4311 Ring Modular? Riptide HSF RT HP Dom + 13e0 0210 HP-GVC 4320 Riptide PCI Audio Controller 1235 4320 Riptide PCI Audio Controller 4321 Riptide HCF 56k PCI Modem - 1235 4321 Riptide HCF 56k PCI Modem + 1235 4321 Hewlett Packard DF + 1235 4324 Hewlett Packard DF + 13e0 0210 Hewlett Packard DF + 144d 2321 Riptide # Samsung 4322 Riptide PCI Game Controller 1235 4322 Riptide PCI Game Controller 8234 RapidFire 616X ATM155 Adapter @@ -3886,6 +3964,7 @@ 148b INNOMEDIALOGIC Inc. 148c C.P. Technology Co. Ltd 148d DIGICOM Systems, Inc. + 1003 HCF 56k Data/Fax Modem 148e OSI Plus Corporation 148f Plant Equipment, Inc. 1490 Stone Microsystems PTY Ltd. @@ -4011,6 +4090,7 @@ 14e4 0007 NetXtreme BCM5701 1000BaseSX 14e4 0008 NetXtreme BCM5701 1000BaseTX 14e4 8008 NetXtreme BCM5701 1000BaseTX + 5820 BCM5820 Crypto Accelerator 14e5 Pixelfusion Ltd 14e6 SHINING Technology Inc 14e7 3CX @@ -4023,30 +4103,123 @@ 14ee MASPRO KENKOH Corp 14ef CARRY Computer ENG. CO Ltd 14f0 CANON RESEACH CENTRE FRANCE -14f1 CONEXANT - 1033 56K Winmodem - 13e0 02b0 56K Winmodem - 1035 PCI Modem Enumerator - 2003 SoftK56 Winmodem - 14f1 2003 SoftK56 Winmodem - 2004 SoftK56 RemoteTAM Winmodem - 14f1 2004 SoftK56 RemoteTAM Winmodem - 2005 SoftK56 Speakerphone Winmodem - 14f1 2005 SoftK56 Speakerphone Winmodem - 2006 SoftK56 Speakerphone Winmodem - 14f1 2006 SoftK56 Speakerphone Winmodem - 2013 HSP MicroModem 56K - 14f1 2013 SoftK56 Winmodem - 2014 SoftK56 RemoteTAM Winmodem - 144f 101c SoftK56 RemoteTAM Winmodem - 144f 2014 SoftK56 RemoteTAM Winmodem - 2015 SoftK56 Speakerphone Winmodem - 14c8 2115 SoftK56 Speakerphone Winmodem - 14f1 2015 SoftK56 Speakerphone Winmodem - 2016 SoftK56 Speakerphone Winmodem - 14f1 2016 SoftK56 Speakerphone Winmodem - 2443 SoftK56 Speakerphone Winmodem - 14f1 2443 SoftK56 Speakerphone Winmodem +14f1 Conexant + 1033 HCF 56k Data/Fax Modem + 1033 8077 NEC + 122d 4027 Dell Zeus - MDP3880-W(B) Data Fax Modem # Aztech + 122d 4030 Dell Mercury - MDP3880-U(B) Data Fax Modem # Aztech + 122d 4034 Dell Thor - MDP3880-W(U) Data Fax Modem # Aztech + 13e0 020d Dell Copper + 13e0 020e Dell Silver + 13e0 0261 IBM # GVC + 13e0 0290 Compaq Goldwing + 13e0 02a0 IBM # GVC + 13e0 02b0 IBM # GVC + 13e0 02c0 Compaq Scooter + 13e0 02d0 IBM # GVC + 144f 1500 IBM P85-DF # Askey + 144f 1501 IBM P85-DF # Askey + 144f 150a IBM P85-DF # Askey + 144f 150b IBM P85-DF Low Profile # Askey + 144f 1510 IBM P85-DF Low Profile # Askey + 1034 HCF 56k Data/Fax/Voice Modem + 1035 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 10cf 1098 Fujitsu P85-DFSV + 1036 HCF 56k Data/Fax/Voice/Spkp Modem + 122d 4029 MDP3880SP-W # Aztech + 122d 4031 MDP3880SP-U # Aztech + 13e0 0209 Dell Titanium + 13e0 020a Dell Graphite + 13e0 0260 Gateway Red Owl + 13e0 0270 Gateway White Horse + 1052 HCF 56k Data/Fax Modem (Worldwide) + 1053 HCF 56k Data/Fax Modem (Worldwide) + 1054 HCF 56k Data/Fax/Voice Modem (Worldwide) + 1055 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (Worldwide) + 1056 HCF 56k Data/Fax/Voice/Spkp Modem (Worldwide) + 1057 HCF 56k Data/Fax/Voice/Spkp Modem (Worldwide) + 1059 HCF 56k Data/Fax/Voice Modem (Worldwide) + 1063 HCF 56k Data/Fax Modem + 1064 HCF 56k Data/Fax/Voice Modem + 1065 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 1066 HCF 56k Data/Fax/Voice/Spkp Modem + 122d 4033 Dell Athena - MDP3900V-U # Aztech + 1433 HCF 56k Data/Fax Modem + 1434 HCF 56k Data/Fax/Voice Modem + 1435 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 1436 HCF 56k Data/Fax Modem + 1453 HCF 56k Data/Fax Modem + 13e0 0240 IBM # GVC + 13e0 0250 IBM # GVC + 144f 1502 IBM P95-DF # Askey + 144f 1503 IBM P95-DF # Askey + 1454 HCF 56k Data/Fax/Voice Modem + 1455 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 1456 HCF 56k Data/Fax/Voice/Spkp Modem + 122d 4035 Dell Europa - MDP3900V-W # Aztech + 122d 4302 MP3930V-W(C) MiniPCI # Aztech + 1803 HCF 56k Modem + 0e11 0023 623-LAN Grizzly # Compaq + 0e11 0043 623-LAN Yogi # Compaq + 1815 HCF 56k Modem + 0e11 0022 Grizzly # Compaq + 0e11 0042 Yogi # Compaq + 2003 HSF 56k Data/Fax Modem + 2004 HSF 56k Data/Fax/Voice Modem + 2005 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 2006 HSF 56k Data/Fax/Voice/Spkp Modem + 2013 HSF 56k Data/Fax Modem + 0e11 b195 Bear # Compaq + 0e11 b196 Seminole 1 # Compaq + 0e11 b1be Seminole 2 # Compaq + 1025 8013 Acer + 1033 809d NEC + 1033 80bc NEC + 155d 6793 HP + 155d 8850 E Machines + 2014 HSF 56k Data/Fax/Voice Modem + 2015 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem + 2016 HSF 56k Data/Fax/Voice/Spkp Modem + 2043 HSF 56k Data/Fax Modem (Worldwide SmartDAA) + 2044 HSF 56k Data/Fax/Voice Modem (Worldwide SmartDAA) + 2045 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (Worldwide SmartDAA) + 2046 HSF 56k Data/Fax/Voice/Spkp Modem (Worldwide SmartDAA) + 2063 HSF 56k Data/Fax Modem (SmartDAA) + 2064 HSF 56k Data/Fax/Voice Modem (SmartDAA) + 2065 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (SmartDAA) + 2066 HSF 56k Data/Fax/Voice/Spkp Modem (SmartDAA) + 2093 HSF 56k Modem + 155d 2f07 Legend + 2143 HSF 56k Data/Fax/Cell Modem (Mobile Worldwide SmartDAA) + 2144 HSF 56k Data/Fax/Voice/Cell Modem (Mobile Worldwide SmartDAA) + 2145 HSF 56k Data/Fax/Voice/Spkp (w/HS)/Cell Modem (Mob WW SmartDAA) + 2146 HSF 56k Data/Fax/Voice/Spkp/Cell Modem (Mobile Worldwide SmartDAA) + 2163 HSF 56k Data/Fax/Cell Modem (Mobile SmartDAA) + 2164 HSF 56k Data/Fax/Voice/Cell Modem (Mobile SmartDAA) + 2165 HSF 56k Data/Fax/Voice/Spkp (w/Handset)/Cell Modem (Mobile SmartDAA) + 2166 HSF 56k Data/Fax/Voice/Spkp/Cell Modem (Mobile SmartDAA) + 2343 HSF 56k Data/Fax CardBus Modem (Mobile Worldwide SmartDAA) + 2344 HSF 56k Data/Fax/Voice CardBus Modem (Mobile Worldwide SmartDAA) + 2345 HSF 56k Data/Fax/Voice/Spkp (w/HS) CardBus Modem (Mob WW SmartDAA) + 2346 HSF 56k Data/Fax/Voice/Spkp CardBus Modem (Mobile Worldwide SmartDAA) + 2363 HSF 56k Data/Fax CardBus Modem (Mobile SmartDAA) + 2364 HSF 56k Data/Fax/Voice CardBus Modem (Mobile SmartDAA) + 2365 HSF 56k Data/Fax/Voice/Spkp (w/HS) CardBus Modem (Mob SmartDAA) + 2366 HSF 56k Data/Fax/Voice/Spkp CardBus Modem (Mobile SmartDAA) + 2443 HSF 56k Data/Fax Modem (Mobile Worldwide SmartDAA) + 104d 8075 Modem # Sony + 104d 8083 Modem # Sony + 104d 8097 Modem # Sony + 2444 HSF 56k Data/Fax/Voice Modem (Mobile Worldwide SmartDAA) + 2445 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mobile WW SmartDAA) + 2446 HSF 56k Data/Fax/Voice/Spkp Modem (Mobile Worldwide SmartDAA) + 2463 HSF 56k Data/Fax Modem (Mobile SmartDAA) + 2464 HSF 56k Data/Fax/Voice Modem (Mobile SmartDAA) + 2465 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (Mobile SmartDAA) + 2466 HSF 56k Data/Fax/Voice/Spkp Modem (Mobile SmartDAA) + 2f00 HSF 56k HSFi Modem + 13e0 8d84 IBM HSFi V.90 + 13e0 8d85 Compaq Stinger 14f2 MOBILITY Electronics 14f3 BROADLOGIC 14f4 TOKYO Electronic Industry CO Ltd @@ -4661,7 +4834,7 @@ 0e11 b0c6 Embedded NC3120 with Wake on LAN 0e11 b0c7 Embedded NC3121 0e11 b0d7 NC3121 with Wake on LAN - 0e11 b0dd NC3131 + 0e11 b0dd NC3131 (82558B) 0e11 b0de NC3132 0e11 b0e1 NC3133 0e11 b144 NC3123 (82559) @@ -4729,6 +4902,8 @@ 1a21 82840 840 (Carmel) Chipset Host Bridge (Hub A) 1a23 82840 840 (Carmel) Chipset AGP Bridge 1a24 82840 840 (Carmel) Chipset PCI Bridge (Hub B) + 1a30 82845 845 (Brookdale) Chipset Host Bridge + 1a31 82845 845 (Brookdale) Chipset AGP Bridge 2410 82801AA ISA Bridge (LPC) 2411 82801AA IDE 2412 82801AA USB |
|
From: Paul M. <le...@us...> - 2001-11-06 09:18:28
|
Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/net
Modified Files:
Config.in Makefile
Log Message:
Sync with OSS 2.4.13.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Config.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Config.in 2001/10/19 21:19:39 1.12
+++ Config.in 2001/11/06 02:57:38 1.13
@@ -176,6 +176,7 @@
dep_tristate ' PCI NE2000 and clones support (see help)' CONFIG_NE2K_PCI $CONFIG_PCI
dep_tristate ' Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
dep_tristate ' Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210 $CONFIG_EISA $CONFIG_EXPERIMENTAL
+ dep_tristate ' RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)' CONFIG_8139CP $CONFIG_PCI $CONFIG_EXPERIMENTAL
dep_tristate ' RealTek RTL-8139 PCI Fast Ethernet Adapter support' CONFIG_8139TOO $CONFIG_PCI
dep_mbool ' Use PIO instead of MMIO' CONFIG_8139TOO_PIO $CONFIG_8139TOO
dep_mbool ' Support for automatic channel equalization (EXPERIMENTAL)' CONFIG_8139TOO_TUNE_TWISTER $CONFIG_8139TOO $CONFIG_EXPERIMENTAL
@@ -191,7 +192,7 @@
if [ "$CONFIG_OBSOLETE" = "y" ]; then
dep_bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET $CONFIG_ISA
fi
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_MIPS" = "y" ]; then
bool ' Philips SAA9730 Ethernet support (EXPERIMENTAL)' CONFIG_LAN_SAA9730
fi
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 2001/10/22 19:16:45 1.6
+++ Makefile 2001/11/06 02:57:38 1.7
@@ -165,6 +165,7 @@
obj-$(CONFIG_3C515) += 3c515.o
obj-$(CONFIG_EEXPRESS) += eexpress.o
obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
+obj-$(CONFIG_8139CP) += 8139cp.o
obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_WAVELAN) += wavelan.o
obj-$(CONFIG_ARLAN) += arlan.o arlan-proc.o
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:15:52
|
Update of /cvsroot/linux-mips/linux/drivers/pcmcia In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/pcmcia Modified Files: Makefile Log Message: Sync with OSS 2.4.13. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 2001/09/05 18:30:03 1.1 +++ Makefile 2001/11/06 02:57:38 1.2 @@ -57,10 +57,33 @@ au1000_ss-objs-y := au1000_generic.o au1000_ss-objs-$(CONFIG_MIPS_PB1000) += au1000_pb1000.o +obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o + +sa1100_cs-objs-y := sa1100_generic.o +sa1100_cs-objs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o +sa1100_cs-objs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o +sa1100_cs-objs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o +sa1100_cs-objs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o +sa1100_cs-objs-$(CONFIG_SA1100_GRAPHICSCLIENT) += sa1100_graphicsclient.o +sa1100_cs-objs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o +sa1100_cs-objs-$(CONFIG_SA1100_PANGOLIN) += sa1100_pangolin.o +sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o +sa1100_cs-objs-$(CONFIG_SA1100_FREEBIRD) += sa1100_freebird.o +sa1100_cs-objs-$(CONFIG_SA1100_PFS168) += sa1100_pfs168.o +sa1100_cs-objs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o +sa1100_cs-objs-$(CONFIG_SA1100_FLEXANET) += sa1100_flexanet.o +sa1100_cs-objs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o +sa1100_cs-objs-$(CONFIG_SA1100_GRAPHICSMASTER) += sa1100_graphicsmaster.o +sa1100_cs-objs-$(CONFIG_SA1100_ADSBITSY) += sa1100_adsbitsy.o +sa1100_cs-objs-$(CONFIG_SA1100_STORK) += sa1100_stork.o + include $(TOPDIR)/Rules.make pcmcia_core.o: $(pcmcia_core-objs) $(LD) $(LD_RFLAG) -r -o $@ $(pcmcia_core-objs) + +sa1100_cs.o: $(sa1100_cs-objs-y) + $(LD) -r -o $@ $(sa1100_cs-objs-y) au1000_ss.o: $(au1000_ss-objs-y) $(LD) -r -o $@ $(au1000_ss-objs-y) |
|
From: Paul M. <le...@us...> - 2001-11-06 09:15:51
|
Update of /cvsroot/linux-mips/linux/drivers/scsi In directory usw-pr-cvs1:/tmp/cvs-serv10490/drivers/scsi Modified Files: sym53c8xx_defs.h Log Message: Sync with OSS 2.4.13. Index: sym53c8xx_defs.h =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/scsi/sym53c8xx_defs.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sym53c8xx_defs.h 2001/10/19 21:19:39 1.3 +++ sym53c8xx_defs.h 2001/11/06 02:57:38 1.4 @@ -188,20 +188,6 @@ #endif /* - * Should we enable DAC cycles on Sparc64 platform? - * Until further investigation we do not enable it - * at the moment. - * We may want to enable it for __ia64__ (untested) - */ -#if defined(__ia64__) -# if !defined(SCSI_NCR_USE_64BIT_DAC) -# define SCSI_NCR_USE_64BIT_DAC -# endif -#else -# undef SCSI_NCR_USE_64BIT_DAC -#endif - -/* * Immediate arbitration */ #if defined(CONFIG_SCSI_NCR53C8XX_IARB) @@ -209,13 +195,6 @@ #endif /* - * Should we enable DAC cycles on sparc64 platforms? - * Until further investigation we do not enable it - * anywhere at the moment. - */ -#undef SCSI_NCR_USE_64BIT_DAC - -/* * Sync transfer frequency at startup. * Allow from 5Mhz to 80Mhz default 20 Mhz. */ @@ -759,6 +738,7 @@ #define FE_66MHZ (1<<23) /* 66MHz PCI Support */ #define FE_DAC (1<<24) /* Support DAC cycles (64 bit addressing) */ #define FE_ISTAT1 (1<<25) /* Have ISTAT1, MBOX0, MBOX1 registers */ +#define FE_DAC_IN_USE (1<<26) /* Platform does DAC cycles */ #define FE_CACHE_SET (FE_ERL|FE_CLSE|FE_WRIE|FE_ERMP) #define FE_SCSI_SET (FE_WIDE|FE_ULTRA|FE_ULTRA2|FE_DBLR|FE_QUAD|F_CLK80) |
|
From: Paul M. <le...@us...> - 2001-11-06 09:15:39
|
Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv10490/include/asm-mips64
Modified Files:
pci.h unistd.h
Log Message:
Sync with OSS 2.4.13.
Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pci.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pci.h 2001/10/31 18:26:52 1.4
+++ pci.h 2001/11/06 02:57:38 1.5
@@ -7,6 +7,7 @@
#define _ASM_PCI_H
#include <linux/config.h>
+#include <linux/types.h>
#ifdef __KERNEL__
@@ -125,6 +126,35 @@
}
/*
+ * pci_{map,unmap}_single_page maps a kernel page to a dma_addr_t. identical
+ * to pci_map_single, but takes a struct page instead of a virtual address
+ */
+static inline dma_addr_t pci_map_page(struct pci_dev *hwdev, struct page *page,
+ unsigned long offset, size_t size,
+ int direction)
+{
+ unsigned long addr;
+
+ if (direction == PCI_DMA_NONE)
+ BUG();
+
+ addr = (unsigned long) page_address(page);
+#ifndef CONFIG_COHERENT_IO
+ dma_cache_wback_inv(addr, size);
+#endif
+
+ return virt_to_bus((void *)addr);
+}
+
+static inline void pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
+ size_t size, int direction)
+{
+ if (direction == PCI_DMA_NONE)
+ BUG();
+ /* Nothing to do */
+}
+
+/*
* Map a set of buffers described by scatterlist in streaming
* mode for DMA. This is the scather-gather version of the
* above pci_map_single interface. Here the scatter gather list
@@ -220,7 +250,7 @@
}
#endif /* CONFIG_MAPPED_PCI_IO */
-static inline int pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
+static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
{
/*
* we fall back to GFP_DMA when the mask isn't all 1s,
@@ -232,6 +262,40 @@
return 1;
}
+
+/* This is always fine. */
+/* Well ... this actually needs more thought ... */
+#define pci_dac_dma_supported(pci_dev, mask) (0)
+
+#if 0
+static __inline__ dma64_addr_t
+pci_dac_page_to_dma(struct pci_dev *pdev, struct page *page, unsigned long offset, int direction)
+{
+ return ((dma64_addr_t) page_to_bus(page) +
+ (dma64_addr_t) offset);
+}
+
+static __inline__ struct page *
+pci_dac_dma_to_page(struct pci_dev *pdev, dma64_addr_t dma_addr)
+{
+ unsigned long poff = (dma_addr >> PAGE_SHIFT);
+
+ return mem_map + poff;
+}
+
+static __inline__ unsigned long
+pci_dac_dma_to_offset(struct pci_dev *pdev, dma64_addr_t dma_addr)
+{
+ return (dma_addr & ~PAGE_MASK);
+}
+
+static __inline__ void
+pci_dac_dma_sync_single(struct pci_dev *pdev, dma64_addr_t dma_addr,
+ size_t len, int direction)
+{
+ /* Nothing to do. */
+}
+#endif
/*
* Return the index of the PCI controller for device.
Index: unistd.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/unistd.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unistd.h 2001/11/06 00:30:47 1.3
+++ unistd.h 2001/11/06 02:57:38 1.4
@@ -239,11 +239,12 @@
#define __NR_Linux32_fcntl64 (__NR_Linux32 + 220)
#define __NR_Linux32_security (__NR_Linux32 + 221)
#define __NR_Linux32_gettid (__NR_Linux32 + 222)
+#define __NR_Linux32_readahead (__NR_Linux32 + 223)
/*
* Offset of the last Linux o32 flavoured syscall
*/
-#define __NR_Linux32_syscalls 222
+#define __NR_Linux32_syscalls 223
/*
* Linux 64-bit syscalls are in the range from 5000 to 5999.
@@ -465,11 +466,12 @@
#define __NR_getdents64 (__NR_Linux + 213)
#define __NR__security (__NR_Linux + 214)
#define __NR__gettid (__NR_Linux + 215)
+#define __NR__readahead (__NR_Linux + 216)
/*
* Offset of the last Linux flavoured syscall
*/
-#define __NR_Linux_syscalls 215
+#define __NR_Linux_syscalls 216
#ifndef _LANGUAGE_ASSEMBLY
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:28
|
Update of /cvsroot/linux-mips/linux/kernel In directory usw-pr-cvs1:/tmp/cvs-serv23524/kernel Modified Files: printk.c Log Message: Sync with OSS 2.4.14. Index: printk.c =================================================================== RCS file: /cvsroot/linux-mips/linux/kernel/printk.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- printk.c 2001/10/19 21:19:40 1.6 +++ printk.c 2001/11/06 09:10:22 1.7 @@ -24,10 +24,18 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/interrupt.h> /* For in_interrupt() */ +#include <linux/config.h> #include <asm/uaccess.h> +#ifdef CONFIG_MULTIQUAD +#define LOG_BUF_LEN (65536) +#elif defined(CONFIG_SMP) +#define LOG_BUF_LEN (32768) +#else #define LOG_BUF_LEN (16384) /* This must be a power of two */ +#endif + #define LOG_BUF_MASK (LOG_BUF_LEN-1) /* printk's without a loglevel use this.. */ |
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:28
|
Update of /cvsroot/linux-mips/linux/include/asm-mips In directory usw-pr-cvs1:/tmp/cvs-serv23524/include/asm-mips Modified Files: pci.h Log Message: Sync with OSS 2.4.14. Index: pci.h =================================================================== RCS file: /cvsroot/linux-mips/linux/include/asm-mips/pci.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pci.h 2001/11/06 02:57:38 1.5 +++ pci.h 2001/11/06 09:10:22 1.6 @@ -8,6 +8,7 @@ #include <linux/config.h> #include <linux/types.h> +#include <asm/io.h> /* for virt_to_bus() */ #ifdef __KERNEL__ |
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:28
|
Update of /cvsroot/linux-mips/linux/fs
In directory usw-pr-cvs1:/tmp/cvs-serv23524/fs
Modified Files:
Config.in Makefile
Log Message:
Sync with OSS 2.4.14.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in 2001/11/06 00:30:47 1.3
+++ Config.in 2001/11/06 09:10:22 1.4
@@ -41,6 +41,7 @@
tristate 'ISO 9660 CDROM file system support' CONFIG_ISO9660_FS
dep_mbool ' Microsoft Joliet CDROM extensions' CONFIG_JOLIET $CONFIG_ISO9660_FS
+dep_mbool ' Transparent decompression extension' CONFIG_ZISOFS $CONFIG_ISO9660_FS
tristate 'Minix fs support' CONFIG_MINIX_FS
@@ -126,6 +127,24 @@
# for fs/nls/Config.in
define_bool CONFIG_NCPFS_NLS n
define_bool CONFIG_SMB_FS n
+fi
+
+#
+# Do we need the compression support?
+#
+if [ "$CONFIG_ZISOFS" = "y" ]; then
+ define_tristate CONFIG_ZISOFS_FS $CONFIG_ISO9660_FS
+else
+ define_tristate CONFIG_ZISOFS_FS n
+fi
+if [ "$CONFIG_CRAMFS" = "y" -o "$CONFIG_ZISOFS_FS" = "y" ]; then
+ define_tristate CONFIG_ZLIB_FS_INFLATE y
+else
+ if [ "$CONFIG_CRAMFS" = "m" -o "$CONFIG_ZISOFS_FS" = "m" ]; then
+ define_tristate CONFIG_ZLIB_FS_INFLATE m
+ else
+ define_tristate CONFIG_ZLIB_FS_INFLATE n
+ fi
fi
mainmenu_option next_comment
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 2001/11/06 00:30:47 1.4
+++ Makefile 2001/11/06 09:10:22 1.5
@@ -27,6 +27,7 @@
# Do not add any filesystems before this line
subdir-$(CONFIG_EXT2_FS) += ext2
+subdir-$(CONFIG_ZLIB_FS_INFLATE) += inflate_fs
subdir-$(CONFIG_CRAMFS) += cramfs
subdir-$(CONFIG_RAMFS) += ramfs
subdir-$(CONFIG_CODA_FS) += coda
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:28
|
Update of /cvsroot/linux-mips/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv23524/include/linux
Modified Files:
netdevice.h pci_ids.h sched.h
Log Message:
Sync with OSS 2.4.14.
Index: netdevice.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/netdevice.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- netdevice.h 2001/11/06 00:43:17 1.6
+++ netdevice.h 2001/11/06 09:10:22 1.7
@@ -188,7 +188,10 @@
{
struct hh_cache *hh_next; /* Next entry */
atomic_t hh_refcnt; /* number of users */
- unsigned short hh_type; /* protocol identifier, f.e ETH_P_IP */
+ unsigned short hh_type; /* protocol identifier, f.e ETH_P_IP
+ * NOTE: For VLANs, this will be the
+ * encapuslated type. --BLG
+ */
int hh_len; /* length of header */
int (*hh_output)(struct sk_buff *skb);
rwlock_t hh_lock;
@@ -292,6 +295,11 @@
unsigned short flags; /* interface flags (a la BSD) */
unsigned short gflags;
+ unsigned short priv_flags; /* Like 'flags' but invisible to userspace. */
+ unsigned short unused_alignment_fixer; /* Because we need priv_flags,
+ * and we want to be 32-bit aligned.
+ */
+
unsigned mtu; /* interface MTU value */
unsigned short type; /* interface hardware type */
unsigned short hard_header_len; /* hardware hdr length */
Index: pci_ids.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/pci_ids.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pci_ids.h 2001/11/06 02:57:38 1.10
+++ pci_ids.h 2001/11/06 09:10:22 1.11
@@ -285,6 +285,8 @@
#define PCI_DEVICE_ID_NS_87415 0x0002
#define PCI_DEVICE_ID_NS_87560_LIO 0x000e
#define PCI_DEVICE_ID_NS_87560_USB 0x0012
+#define PCI_DEVICE_ID_NS_83815 0x0020
+#define PCI_DEVICE_ID_NS_83820 0x0022
#define PCI_DEVICE_ID_NS_87410 0xd001
#define PCI_VENDOR_ID_TSENG 0x100c
@@ -1266,6 +1268,10 @@
#define PCI_VENDOR_ID_ITE 0x1283
#define PCI_DEVICE_ID_ITE_IT8172G 0x8172
+#define PCI_VENDOR_ID_ITE 0x1283
+#define PCI_DEVICE_ID_ITE_8872 0x8872
+
+
/* formerly Platform Tech */
#define PCI_VENDOR_ID_ESS_OLD 0x1285
#define PCI_DEVICE_ID_ESS_ESS0100 0x0100
@@ -1387,6 +1393,7 @@
#define PCI_VENDOR_ID_NETGEAR 0x1385
#define PCI_DEVICE_ID_NETGEAR_GA620 0x620a
+#define PCI_DEVICE_ID_NETGEAR_GA622 0x622a
#define PCI_VENDOR_ID_APPLICOM 0x1389
#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
@@ -1508,6 +1515,10 @@
#define PCI_VENDOR_ID_AVANCE 0x4005
#define PCI_DEVICE_ID_AVANCE_ALG2064 0x2064
#define PCI_DEVICE_ID_AVANCE_2302 0x2302
+
+#define PCI_VENDOR_ID_AKS 0x416c
+#define PCI_DEVICE_ID_AKS_ALADDINCARD 0x0100
+#define PCI_DEVICE_ID_AKS_CPC 0x0200
#define PCI_VENDOR_ID_NETVIN 0x4a14
#define PCI_DEVICE_ID_NETVIN_NV5000SC 0x5000
Index: sched.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/linux/sched.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sched.h 2001/11/06 00:43:17 1.5
+++ sched.h 2001/11/06 09:10:22 1.6
@@ -413,6 +413,7 @@
#define PF_DUMPCORE 0x00000200 /* dumped core */
#define PF_SIGNALED 0x00000400 /* killed by a signal */
#define PF_MEMALLOC 0x00000800 /* Allocating memory */
+#define PF_MEMDIE 0x00001000 /* Killed for out-of-memory */
#define PF_FREE_PAGES 0x00002000 /* per process page freeing */
#define PF_USEDFPU 0x00100000 /* task used FPU this quantum (SMP) */
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:28
|
Update of /cvsroot/linux-mips/linux/include/asm-mips64
In directory usw-pr-cvs1:/tmp/cvs-serv23524/include/asm-mips64
Modified Files:
pci.h
Log Message:
Sync with OSS 2.4.14.
Index: pci.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips64/pci.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pci.h 2001/11/06 02:57:38 1.5
+++ pci.h 2001/11/06 09:10:22 1.6
@@ -8,6 +8,7 @@
#include <linux/config.h>
#include <linux/types.h>
+#include <asm/io.h> /* for virt_to_bus() */
#ifdef __KERNEL__
@@ -133,17 +134,14 @@
unsigned long offset, size_t size,
int direction)
{
- unsigned long addr;
-
if (direction == PCI_DMA_NONE)
BUG();
- addr = (unsigned long) page_address(page);
#ifndef CONFIG_COHERENT_IO
- dma_cache_wback_inv(addr, size);
+ dma_cache_wback_inv((unsigned long) page_address(page), size);
#endif
- return virt_to_bus((void *)addr);
+ return page_to_bus(page);
}
static inline void pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:27
|
Update of /cvsroot/linux-mips/linux/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/scsi
Modified Files:
wd33c93.c
Log Message:
Sync with OSS 2.4.14.
Index: wd33c93.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/wd33c93.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wd33c93.c 2001/08/10 03:04:58 1.3
+++ wd33c93.c 2001/11/06 09:10:22 1.4
@@ -175,71 +175,72 @@
-static inline uchar read_wd33c93(wd33c93_regs *regp,uchar reg_num)
+static inline uchar read_wd33c93(const wd33c93_regs regs, uchar reg_num)
{
- regp->SASR = reg_num;
+ *regs.SASR = reg_num;
mb();
- return(regp->SCMD);
+ return(*regs.SCMD);
}
-#define READ_AUX_STAT() (regp->SASR)
+#define READ_AUX_STAT() (*regs.SASR)
-static inline void write_wd33c93(wd33c93_regs *regp,uchar reg_num, uchar value)
+static inline void write_wd33c93(const wd33c93_regs regs, uchar reg_num,
+ uchar value)
{
- regp->SASR = reg_num;
+ *regs.SASR = reg_num;
mb();
- regp->SCMD = value;
+ *regs.SCMD = value;
mb();
}
-static inline void write_wd33c93_cmd(wd33c93_regs *regp, uchar cmd)
+static inline void write_wd33c93_cmd(const wd33c93_regs regs, uchar cmd)
{
- regp->SASR = WD_COMMAND;
+ *regs.SASR = WD_COMMAND;
mb();
- regp->SCMD = cmd;
+ *regs.SCMD = cmd;
mb();
}
-static inline uchar read_1_byte(wd33c93_regs *regp)
+static inline uchar read_1_byte(const wd33c93_regs regs)
{
uchar asr;
uchar x = 0;
- write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
- write_wd33c93_cmd(regp, WD_CMD_TRANS_INFO|0x80);
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
+ write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO|0x80);
do {
asr = READ_AUX_STAT();
if (asr & ASR_DBR)
- x = read_wd33c93(regp, WD_DATA);
+ x = read_wd33c93(regs, WD_DATA);
} while (!(asr & ASR_INT));
return x;
}
-static void write_wd33c93_count(wd33c93_regs *regp,unsigned long value)
+static void write_wd33c93_count(const wd33c93_regs regs, unsigned long value)
{
- regp->SASR = WD_TRANSFER_COUNT_MSB;
+ *regs.SASR = WD_TRANSFER_COUNT_MSB;
mb();
- regp->SCMD = value >> 16;
- regp->SCMD = value >> 8;
- regp->SCMD = value;
+ *regs.SCMD = value >> 16;
+ *regs.SCMD = value >> 8;
+ *regs.SCMD = value;
mb();
}
-static unsigned long read_wd33c93_count(wd33c93_regs *regp)
+static unsigned long read_wd33c93_count(const wd33c93_regs regs)
{
unsigned long value;
- regp->SASR = WD_TRANSFER_COUNT_MSB;
+ *regs.SASR = WD_TRANSFER_COUNT_MSB;
mb();
- value = regp->SCMD << 16;
- value |= regp->SCMD << 8;
- value |= regp->SCMD;
+ value = *regs.SCMD << 16;
+ value |= *regs.SCMD << 8;
+ value |= *regs.SCMD;
mb();
return value;
}
@@ -423,14 +424,11 @@
*/
static void wd33c93_execute (struct Scsi_Host *instance)
{
-struct WD33C93_hostdata *hostdata;
-wd33c93_regs *regp;
+struct WD33C93_hostdata *hostdata = (struct WD33C93_hostdata *)instance->hostdata;
+const wd33c93_regs regs = hostdata->regs;
Scsi_Cmnd *cmd, *prev;
int i;
- hostdata = (struct WD33C93_hostdata *)instance->hostdata;
- regp = hostdata->regp;
-
DB(DB_EXECUTE,printk("EX("))
if (hostdata->selecting || hostdata->connected) {
@@ -479,9 +477,9 @@
*/
if (is_dir_out(cmd))
- write_wd33c93(regp, WD_DESTINATION_ID, cmd->target);
+ write_wd33c93(regs, WD_DESTINATION_ID, cmd->target);
else
- write_wd33c93(regp, WD_DESTINATION_ID, cmd->target | DSTID_DPD);
+ write_wd33c93(regs, WD_DESTINATION_ID, cmd->target | DSTID_DPD);
/* Now we need to figure out whether or not this command is a good
* candidate for disconnect/reselect. We guess to the best of our
@@ -537,10 +535,10 @@
no:
- write_wd33c93(regp, WD_SOURCE_ID, ((cmd->SCp.phase)?SRCID_ER:0));
+ write_wd33c93(regs, WD_SOURCE_ID, ((cmd->SCp.phase)?SRCID_ER:0));
- write_wd33c93(regp, WD_TARGET_LUN, cmd->lun);
- write_wd33c93(regp,WD_SYNCHRONOUS_TRANSFER,hostdata->sync_xfer[cmd->target]);
+ write_wd33c93(regs, WD_TARGET_LUN, cmd->lun);
+ write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER,hostdata->sync_xfer[cmd->target]);
hostdata->busy[cmd->target] |= (1 << cmd->lun);
if ((hostdata->level2 == L2_NONE) ||
@@ -571,8 +569,8 @@
if (hostdata->sync_stat[cmd->target] == SS_UNSET)
hostdata->sync_stat[cmd->target] = SS_FIRST;
hostdata->state = S_SELECTING;
- write_wd33c93_count(regp,0); /* guarantee a DATA_PHASE interrupt */
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN);
+ write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN);
}
else {
@@ -586,15 +584,15 @@
*/
hostdata->connected = cmd;
- write_wd33c93(regp, WD_COMMAND_PHASE, 0);
+ write_wd33c93(regs, WD_COMMAND_PHASE, 0);
/* copy command_descriptor_block into WD chip
* (take advantage of auto-incrementing)
*/
- regp->SASR = WD_CDB_1;
+ *regs.SASR = WD_CDB_1;
for (i=0; i<cmd->cmd_len; i++)
- regp->SCMD = cmd->cmnd[i];
+ *regs.SCMD = cmd->cmnd[i];
/* The wd33c93 only knows about Group 0, 1, and 5 commands when
* it's doing a 'select-and-transfer'. To be safe, we write the
@@ -602,7 +600,7 @@
* way there won't be problems with vendor-unique, audio, etc.
*/
- write_wd33c93(regp, WD_OWN_ID, cmd->cmd_len);
+ write_wd33c93(regs, WD_OWN_ID, cmd->cmd_len);
/* When doing a non-disconnect command with DMA, we can save
* ourselves a DATA phase interrupt later by setting everything
@@ -612,17 +610,17 @@
if ((cmd->SCp.phase == 0) && (hostdata->no_dma == 0)) {
if (hostdata->dma_setup(cmd,
(is_dir_out(cmd))?DATA_OUT_DIR:DATA_IN_DIR))
- write_wd33c93_count(regp,0); /* guarantee a DATA_PHASE interrupt */
+ write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */
else {
- write_wd33c93(regp,WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA);
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA);
hostdata->dma = D_DMA_RUNNING;
}
}
else
- write_wd33c93_count(regp,0); /* guarantee a DATA_PHASE interrupt */
+ write_wd33c93_count(regs, 0); /* guarantee a DATA_PHASE interrupt */
hostdata->state = S_RUNNING_LEVEL2;
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER);
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
}
/*
@@ -637,28 +635,28 @@
-static void transfer_pio(wd33c93_regs *regp, uchar *buf, int cnt,
+static void transfer_pio(const wd33c93_regs regs, uchar *buf, int cnt,
int data_in_dir, struct WD33C93_hostdata *hostdata)
{
uchar asr;
DB(DB_TRANSFER,printk("(%p,%d,%s:",buf,cnt,data_in_dir?"in":"out"))
- write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
- write_wd33c93_count(regp,cnt);
- write_wd33c93_cmd(regp, WD_CMD_TRANS_INFO);
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
+ write_wd33c93_count(regs, cnt);
+ write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO);
if (data_in_dir) {
do {
asr = READ_AUX_STAT();
if (asr & ASR_DBR)
- *buf++ = read_wd33c93(regp, WD_DATA);
+ *buf++ = read_wd33c93(regs, WD_DATA);
} while (!(asr & ASR_INT));
}
else {
do {
asr = READ_AUX_STAT();
if (asr & ASR_DBR)
- write_wd33c93(regp, WD_DATA, *buf++);
+ write_wd33c93(regs, WD_DATA, *buf++);
} while (!(asr & ASR_INT));
}
@@ -673,7 +671,8 @@
-static void transfer_bytes(wd33c93_regs *regp, Scsi_Cmnd *cmd, int data_in_dir)
+static void transfer_bytes(const wd33c93_regs regs, Scsi_Cmnd *cmd,
+ int data_in_dir)
{
struct WD33C93_hostdata *hostdata;
unsigned long length;
@@ -695,7 +694,7 @@
cmd->SCp.ptr = cmd->SCp.buffer->address;
}
- write_wd33c93(regp,WD_SYNCHRONOUS_TRANSFER,hostdata->sync_xfer[cmd->target]);
+ write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER,hostdata->sync_xfer[cmd->target]);
/* 'hostdata->no_dma' is TRUE if we don't even want to try DMA.
* Update 'this_residual' and 'ptr' after 'transfer_pio()' returns.
@@ -713,10 +712,10 @@
#ifdef PROC_STATISTICS
hostdata->pio_cnt++;
#endif
- transfer_pio(regp, (uchar *)cmd->SCp.ptr, cmd->SCp.this_residual,
+ transfer_pio(regs, (uchar *)cmd->SCp.ptr, cmd->SCp.this_residual,
data_in_dir, hostdata);
length = cmd->SCp.this_residual;
- cmd->SCp.this_residual = read_wd33c93_count(regp);
+ cmd->SCp.this_residual = read_wd33c93_count(regs);
cmd->SCp.ptr += (length - cmd->SCp.this_residual);
}
@@ -733,16 +732,16 @@
#ifdef PROC_STATISTICS
hostdata->dma_cnt++;
#endif
- write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA);
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_DMA);
if ((hostdata->level2 >= L2_DATA) ||
(hostdata->level2 == L2_BASIC && cmd->SCp.phase == 0)) {
- write_wd33c93(regp, WD_COMMAND_PHASE, 0x45);
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER);
+ write_wd33c93(regs, WD_COMMAND_PHASE, 0x45);
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
hostdata->state = S_RUNNING_LEVEL2;
}
else
- write_wd33c93_cmd(regp, WD_CMD_TRANS_INFO);
+ write_wd33c93_cmd(regs, WD_CMD_TRANS_INFO);
hostdata->dma = D_DMA_RUNNING;
}
@@ -752,15 +751,12 @@
void wd33c93_intr (struct Scsi_Host *instance)
{
-struct WD33C93_hostdata *hostdata;
+struct WD33C93_hostdata *hostdata = (struct WD33C93_hostdata *)instance->hostdata;
+const wd33c93_regs regs = hostdata->regs;
Scsi_Cmnd *patch, *cmd;
-wd33c93_regs *regp;
uchar asr, sr, phs, id, lun, *ucp, msg;
unsigned long length, flags;
- hostdata = (struct WD33C93_hostdata *)instance->hostdata;
- regp = hostdata->regp;
-
asr = READ_AUX_STAT();
if (!(asr & ASR_INT) || (asr & ASR_BSY))
return;
@@ -772,8 +768,8 @@
#endif
cmd = (Scsi_Cmnd *)hostdata->connected; /* assume we're connected */
- sr = read_wd33c93(regp, WD_SCSI_STATUS); /* clear the interrupt */
- phs = read_wd33c93(regp, WD_COMMAND_PHASE);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear the interrupt */
+ phs = read_wd33c93(regs, WD_COMMAND_PHASE);
DB(DB_INTR,printk("{%02x:%02x-",asr,sr))
@@ -797,7 +793,7 @@
hostdata->dma_stop(cmd->host, cmd, 1);
hostdata->dma = D_DMA_OFF;
length = cmd->SCp.this_residual;
- cmd->SCp.this_residual = read_wd33c93_count(regp);
+ cmd->SCp.this_residual = read_wd33c93_count(regs);
cmd->SCp.ptr += (length - cmd->SCp.this_residual);
DB(DB_TRANSFER,printk("%p/%d]",cmd->SCp.ptr,cmd->SCp.this_residual))
}
@@ -892,7 +888,7 @@
case CSR_UNEXP |PHS_DATA_IN:
case CSR_SRV_REQ |PHS_DATA_IN:
DB(DB_INTR,printk("IN-%d.%d",cmd->SCp.this_residual,cmd->SCp.buffers_residual))
- transfer_bytes(regp, cmd, DATA_IN_DIR);
+ transfer_bytes(regs, cmd, DATA_IN_DIR);
if (hostdata->state != S_RUNNING_LEVEL2)
hostdata->state = S_CONNECTED;
break;
@@ -902,7 +898,7 @@
case CSR_UNEXP |PHS_DATA_OUT:
case CSR_SRV_REQ |PHS_DATA_OUT:
DB(DB_INTR,printk("OUT-%d.%d",cmd->SCp.this_residual,cmd->SCp.buffers_residual))
- transfer_bytes(regp, cmd, DATA_OUT_DIR);
+ transfer_bytes(regs, cmd, DATA_OUT_DIR);
if (hostdata->state != S_RUNNING_LEVEL2)
hostdata->state = S_CONNECTED;
break;
@@ -914,7 +910,7 @@
case CSR_UNEXP |PHS_COMMAND:
case CSR_SRV_REQ |PHS_COMMAND:
DB(DB_INTR,printk("CMND-%02x,%ld",cmd->cmnd[0],cmd->pid))
- transfer_pio(regp, cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, hostdata);
+ transfer_pio(regs, cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, hostdata);
hostdata->state = S_CONNECTED;
break;
@@ -924,13 +920,13 @@
case CSR_SRV_REQ |PHS_STATUS:
DB(DB_INTR,printk("STATUS="))
- cmd->SCp.Status = read_1_byte(regp);
+ cmd->SCp.Status = read_1_byte(regs);
DB(DB_INTR,printk("%02x",cmd->SCp.Status))
if (hostdata->level2 >= L2_BASIC) {
- sr = read_wd33c93(regp, WD_SCSI_STATUS); /* clear interrupt */
+ sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */
hostdata->state = S_RUNNING_LEVEL2;
- write_wd33c93(regp, WD_COMMAND_PHASE, 0x50);
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER);
+ write_wd33c93(regs, WD_COMMAND_PHASE, 0x50);
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
}
else {
hostdata->state = S_CONNECTED;
@@ -943,8 +939,8 @@
case CSR_SRV_REQ |PHS_MESS_IN:
DB(DB_INTR,printk("MSG_IN="))
- msg = read_1_byte(regp);
- sr = read_wd33c93(regp, WD_SCSI_STATUS); /* clear interrupt */
+ msg = read_1_byte(regs);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS); /* clear interrupt */
hostdata->incoming_msg[hostdata->incoming_ptr] = msg;
if (hostdata->incoming_msg[0] == EXTENDED_MESSAGE)
@@ -957,25 +953,25 @@
case COMMAND_COMPLETE:
DB(DB_INTR,printk("CCMP-%ld",cmd->pid))
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_PRE_CMP_DISC;
break;
case SAVE_POINTERS:
DB(DB_INTR,printk("SDP"))
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
break;
case RESTORE_POINTERS:
DB(DB_INTR,printk("RDP"))
if (hostdata->level2 >= L2_BASIC) {
- write_wd33c93(regp, WD_COMMAND_PHASE, 0x45);
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER);
+ write_wd33c93(regs, WD_COMMAND_PHASE, 0x45);
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
hostdata->state = S_RUNNING_LEVEL2;
}
else {
- write_wd33c93_cmd(regp, WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
}
break;
@@ -983,7 +979,7 @@
case DISCONNECT:
DB(DB_INTR,printk("DIS"))
cmd->device->disconnect = 1;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_PRE_TMP_DISC;
break;
@@ -994,7 +990,7 @@
#endif
if (hostdata->sync_stat[cmd->target] == SS_WAITING)
hostdata->sync_stat[cmd->target] = SS_SET;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
break;
@@ -1025,7 +1021,7 @@
* specifically ask for sync transfers, we won't do any.
*/
- write_wd33c93_cmd(regp,WD_CMD_ASSERT_ATN); /* want MESS_OUT */
+ write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */
hostdata->outgoing_msg[0] = EXTENDED_MESSAGE;
hostdata->outgoing_msg[1] = 3;
hostdata->outgoing_msg[2] = EXTENDED_SDTR;
@@ -1042,26 +1038,26 @@
printk("sync_xfer=%02x",hostdata->sync_xfer[cmd->target]);
#endif
hostdata->sync_stat[cmd->target] = SS_SET;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
break;
case EXTENDED_WDTR:
- write_wd33c93_cmd(regp,WD_CMD_ASSERT_ATN); /* want MESS_OUT */
+ write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */
printk("sending WDTR ");
hostdata->outgoing_msg[0] = EXTENDED_MESSAGE;
hostdata->outgoing_msg[1] = 2;
hostdata->outgoing_msg[2] = EXTENDED_WDTR;
hostdata->outgoing_msg[3] = 0; /* 8 bit transfer width */
hostdata->outgoing_len = 4;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
break;
default:
- write_wd33c93_cmd(regp,WD_CMD_ASSERT_ATN); /* want MESS_OUT */
+ write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */
printk("Rejecting Unknown Extended Message(%02x). ",ucp[2]);
hostdata->outgoing_msg[0] = MESSAGE_REJECT;
hostdata->outgoing_len = 1;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
break;
}
@@ -1072,17 +1068,17 @@
else {
hostdata->incoming_ptr++;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
}
break;
default:
printk("Rejecting Unknown Message(%02x) ",msg);
- write_wd33c93_cmd(regp,WD_CMD_ASSERT_ATN); /* want MESS_OUT */
+ write_wd33c93_cmd(regs, WD_CMD_ASSERT_ATN); /* want MESS_OUT */
hostdata->outgoing_msg[0] = MESSAGE_REJECT;
hostdata->outgoing_len = 1;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
hostdata->state = S_CONNECTED;
}
restore_flags(flags);
@@ -1097,11 +1093,11 @@
* have been turned off for the command that just completed.
*/
- write_wd33c93(regp,WD_SOURCE_ID, SRCID_ER);
+ write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER);
if (phs == 0x60) {
DB(DB_INTR,printk("SX-DONE-%ld",cmd->pid))
cmd->SCp.Message = COMMAND_COMPLETE;
- lun = read_wd33c93(regp, WD_TARGET_LUN);
+ lun = read_wd33c93(regs, WD_TARGET_LUN);
DB(DB_INTR,printk(":%d.%d",cmd->SCp.Status,lun))
hostdata->connected = NULL;
hostdata->busy[cmd->target] &= ~(1 << cmd->lun);
@@ -1131,8 +1127,8 @@
case CSR_SDP:
DB(DB_INTR,printk("SDP"))
hostdata->state = S_RUNNING_LEVEL2;
- write_wd33c93(regp, WD_COMMAND_PHASE, 0x41);
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER);
+ write_wd33c93(regs, WD_COMMAND_PHASE, 0x41);
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
break;
@@ -1158,7 +1154,7 @@
hostdata->outgoing_len = 1;
hostdata->outgoing_msg[0] = NOP;
}
- transfer_pio(regp, hostdata->outgoing_msg, hostdata->outgoing_len,
+ transfer_pio(regs, hostdata->outgoing_msg, hostdata->outgoing_len,
DATA_OUT_DIR, hostdata);
DB(DB_INTR,printk("%02x",hostdata->outgoing_msg[0]))
hostdata->outgoing_len = 0;
@@ -1180,7 +1176,7 @@
* have been turned off for the command that just completed.
*/
- write_wd33c93(regp,WD_SOURCE_ID, SRCID_ER);
+ write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER);
if (cmd == NULL) {
printk(" - Already disconnected! ");
hostdata->state = S_UNCONNECTED;
@@ -1211,7 +1207,7 @@
* have been turned off for the command that just completed.
*/
- write_wd33c93(regp,WD_SOURCE_ID, SRCID_ER);
+ write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER);
DB(DB_INTR,printk("DISC-%ld",cmd->pid))
if (cmd == NULL) {
printk(" - Already disconnected! ");
@@ -1296,7 +1292,7 @@
/* OK - find out which device reselected us. */
- id = read_wd33c93(regp, WD_SOURCE_ID);
+ id = read_wd33c93(regs, WD_SOURCE_ID);
id &= SRCID_MASK;
/* and extract the lun from the ID message. (Note that we don't
@@ -1305,9 +1301,9 @@
*/
if (sr == CSR_RESEL_AM) {
- lun = read_wd33c93(regp, WD_DATA);
+ lun = read_wd33c93(regs, WD_DATA);
if (hostdata->level2 < L2_RESELECT)
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
lun &= 7;
}
else {
@@ -1323,12 +1319,12 @@
}
else {
/* Verify this is a change to MSG_IN and read the message */
- sr = read_wd33c93(regp, WD_SCSI_STATUS);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS);
if (sr == (CSR_ABORT | PHS_MESS_IN) ||
sr == (CSR_UNEXP | PHS_MESS_IN) ||
sr == (CSR_SRV_REQ | PHS_MESS_IN)) {
/* Got MSG_IN, grab target LUN */
- lun = read_1_byte(regp);
+ lun = read_1_byte(regs);
/* Now we expect a 'paused with ACK asserted' int.. */
asr = READ_AUX_STAT();
if (!(asr & ASR_INT)) {
@@ -1338,12 +1334,12 @@
printk("wd33c93: No int after LUN on RESEL (%02x)\n",
asr);
}
- sr = read_wd33c93(regp, WD_SCSI_STATUS);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS);
if (sr != CSR_MSGIN)
printk("wd33c93: Not paused with ACK on RESEL (%02x)\n",
sr);
lun &= 7;
- write_wd33c93_cmd(regp,WD_CMD_NEGATE_ACK);
+ write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
}
else {
printk("wd33c93: Not MSG_IN on reselect (%02x)\n", sr);
@@ -1384,13 +1380,13 @@
*/
if (is_dir_out(cmd))
- write_wd33c93(regp, WD_DESTINATION_ID, cmd->target);
+ write_wd33c93(regs, WD_DESTINATION_ID, cmd->target);
else
- write_wd33c93(regp, WD_DESTINATION_ID, cmd->target | DSTID_DPD);
+ write_wd33c93(regs, WD_DESTINATION_ID, cmd->target | DSTID_DPD);
if (hostdata->level2 >= L2_RESELECT) {
- write_wd33c93_count(regp, 0); /* we want a DATA_PHASE interrupt */
- write_wd33c93(regp, WD_COMMAND_PHASE, 0x45);
- write_wd33c93_cmd(regp, WD_CMD_SEL_ATN_XFER);
+ write_wd33c93_count(regs, 0); /* we want a DATA_PHASE interrupt */
+ write_wd33c93(regs, WD_COMMAND_PHASE, 0x45);
+ write_wd33c93_cmd(regs, WD_CMD_SEL_ATN_XFER);
hostdata->state = S_RUNNING_LEVEL2;
}
else
@@ -1411,13 +1407,10 @@
void reset_wd33c93(struct Scsi_Host *instance)
{
-struct WD33C93_hostdata *hostdata;
-wd33c93_regs *regp;
+struct WD33C93_hostdata *hostdata = (struct WD33C93_hostdata *)instance->hostdata;
+const wd33c93_regs regs = hostdata->regs;
uchar sr;
- hostdata = (struct WD33C93_hostdata *)instance->hostdata;
- regp = hostdata->regp;
-
#ifdef CONFIG_SGI_IP22
{
int busycount = 0;
@@ -1438,29 +1431,29 @@
}
#endif
- write_wd33c93(regp, WD_OWN_ID, OWNID_EAF | OWNID_RAF |
+ write_wd33c93(regs, WD_OWN_ID, OWNID_EAF | OWNID_RAF |
instance->this_id | hostdata->clock_freq);
- write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
- write_wd33c93(regp, WD_SYNCHRONOUS_TRANSFER,
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
+ write_wd33c93(regs, WD_SYNCHRONOUS_TRANSFER,
calc_sync_xfer(hostdata->default_sx_per/4,DEFAULT_SX_OFF));
- write_wd33c93(regp, WD_COMMAND, WD_CMD_RESET);
+ write_wd33c93(regs, WD_COMMAND, WD_CMD_RESET);
#ifdef CONFIG_MVME147_SCSI
udelay(25); /* The old wd33c93 on MVME147 needs this, at least */
#endif
while (!(READ_AUX_STAT() & ASR_INT))
;
- sr = read_wd33c93(regp, WD_SCSI_STATUS);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS);
- hostdata->microcode = read_wd33c93(regp, WD_CDB_1);
+ hostdata->microcode = read_wd33c93(regs, WD_CDB_1);
if (sr == 0x00)
hostdata->chip = C_WD33C93;
else if (sr == 0x01) {
- write_wd33c93(regp, WD_QUEUE_TAG, 0xa5); /* any random number */
- sr = read_wd33c93(regp, WD_QUEUE_TAG);
+ write_wd33c93(regs, WD_QUEUE_TAG, 0xa5); /* any random number */
+ sr = read_wd33c93(regs, WD_QUEUE_TAG);
if (sr == 0xa5) {
hostdata->chip = C_WD33C93B;
- write_wd33c93(regp, WD_QUEUE_TAG, 0);
+ write_wd33c93(regs, WD_QUEUE_TAG, 0);
}
else
hostdata->chip = C_WD33C93A;
@@ -1468,8 +1461,8 @@
else
hostdata->chip = C_UNKNOWN_CHIP;
- write_wd33c93(regp, WD_TIMEOUT_PERIOD, TIMEOUT_PERIOD_VALUE);
- write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
+ write_wd33c93(regs, WD_TIMEOUT_PERIOD, TIMEOUT_PERIOD_VALUE);
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
}
@@ -1513,14 +1506,14 @@
{
struct Scsi_Host *instance;
struct WD33C93_hostdata *hostdata;
-wd33c93_regs *regp;
+wd33c93_regs regs;
Scsi_Cmnd *tmp, *prev;
disable_irq(cmd->host->irq);
instance = cmd->host;
hostdata = (struct WD33C93_hostdata *)instance->hostdata;
- regp = hostdata->regp;
+ regs = hostdata->regs;
/*
* Case 1 : If the command hasn't been issued yet, we simply remove it
@@ -1572,8 +1565,8 @@
}
printk("sending wd33c93 ABORT command - ");
- write_wd33c93(regp, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
- write_wd33c93_cmd(regp, WD_CMD_ABORT);
+ write_wd33c93(regs, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
+ write_wd33c93_cmd(regs, WD_CMD_ABORT);
/* Now we have to attempt to flush out the FIFO... */
@@ -1582,11 +1575,11 @@
do {
asr = READ_AUX_STAT();
if (asr & ASR_DBR)
- read_wd33c93(regp, WD_DATA);
+ read_wd33c93(regs, WD_DATA);
} while (!(asr & ASR_INT) && timeout-- > 0);
- sr = read_wd33c93(regp, WD_SCSI_STATUS);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS);
printk("asr=%02x, sr=%02x, %ld bytes un-transferred (timeout=%ld) - ",
- asr, sr, read_wd33c93_count(regp), timeout);
+ asr, sr, read_wd33c93_count(regs), timeout);
/*
* Abort command processed.
@@ -1595,13 +1588,13 @@
*/
printk("sending wd33c93 DISCONNECT command - ");
- write_wd33c93_cmd(regp, WD_CMD_DISCONNECT);
+ write_wd33c93_cmd(regs, WD_CMD_DISCONNECT);
timeout = 1000000;
asr = READ_AUX_STAT();
while ((asr & ASR_CIP) && timeout-- > 0)
asr = READ_AUX_STAT();
- sr = read_wd33c93(regp, WD_SCSI_STATUS);
+ sr = read_wd33c93(regs, WD_SCSI_STATUS);
printk("asr=%02x, sr=%02x.",asr,sr);
hostdata->busy[cmd->target] &= ~(1 << cmd->lun);
@@ -1685,7 +1678,7 @@
*/
if (ints[0]) {
for (i=0; i<ints[0]; i++) {
- x = sprintf(p1,"nosync:0x%02x,", ints[i+1]);
+ x = vsprintf(p1,"nosync:0x%02x,",&(ints[i+1]));
p1 += x;
}
}
@@ -1751,7 +1744,7 @@
-void wd33c93_init (struct Scsi_Host *instance, wd33c93_regs *regs,
+void wd33c93_init(struct Scsi_Host *instance, const wd33c93_regs regs,
dma_setup_t setup, dma_stop_t stop, int clock_freq)
{
struct WD33C93_hostdata *hostdata;
@@ -1765,7 +1758,7 @@
hostdata = (struct WD33C93_hostdata *)instance->hostdata;
- hostdata->regp = regs;
+ hostdata->regs = regs;
hostdata->clock_freq = clock_freq;
hostdata->dma_setup = setup;
hostdata->dma_stop = stop;
@@ -2054,8 +2047,8 @@
#ifdef MODULE
int init_module(void) { return 0; }
void cleanup_module(void) {}
+#endif
void wd33c93_release(void)
{
-MOD_DEC_USE_COUNT;
+ MOD_DEC_USE_COUNT;
}
-#endif
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:27
|
Update of /cvsroot/linux-mips/linux/drivers/net/tulip
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/net/tulip
Modified Files:
interrupt.c tulip_core.c
Log Message:
Sync with OSS 2.4.14.
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/interrupt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- interrupt.c 2001/10/22 19:17:55 1.5
+++ interrupt.c 2001/11/06 09:10:22 1.6
@@ -309,7 +309,7 @@
long ioaddr = dev->base_addr;
int csr5;
int entry;
- int csr8;
+ int missed;
int rx = 0;
int tx = 0;
int oi = 0;
@@ -442,6 +442,7 @@
}
}
if (csr5 & RxDied) { /* Missed a Rx frame. */
+ tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
#ifdef CONFIG_NET_HW_FLOWCONTROL
if (tp->fc_bit && !test_bit(tp->fc_bit, &netdev_fc_xoff)) {
tp->stats.rx_errors++;
@@ -555,8 +556,9 @@
}
}
- csr8 = inl(ioaddr + CSR8);
- tp->stats.rx_dropped += (csr8 & 0x1ffff) + ((csr8 >> 17) & 0xfff);
+ if ((missed = inl(ioaddr + CSR8) & 0x1ffff)) {
+ tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
+ }
if (tulip_debug > 4)
printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#4.4x.\n",
Index: tulip_core.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tulip_core.c 2001/11/06 00:30:45 1.9
+++ tulip_core.c 2001/11/06 09:10:22 1.10
@@ -15,8 +15,8 @@
*/
#define DRV_NAME "tulip"
-#define DRV_VERSION "0.9.15-pre7"
-#define DRV_RELDATE "Oct 2, 2001"
+#define DRV_VERSION "0.9.15-pre8"
+#define DRV_RELDATE "Oct 11, 2001"
#include <linux/config.h>
#include <linux/module.h>
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:27
|
Update of /cvsroot/linux-mips/linux/drivers/video In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/video Modified Files: Makefile Log Message: Sync with OSS 2.4.14. Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/video/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 2001/10/22 22:32:06 1.7 +++ Makefile 2001/11/06 09:10:22 1.8 @@ -15,7 +15,7 @@ fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \ fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \ fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o \ - cyber2000fb.o fbcon-hga.o + cyber2000fb.o sa1100fb.o fbcon-hga.o # Each configuration option enables a list of files. |
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:26
|
Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/pcmcia
Modified Files:
Config.in Makefile
Log Message:
Sync with OSS 2.4.14.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.in 2001/09/05 18:30:03 1.1
+++ Config.in 2001/11/06 09:10:22 1.2
@@ -17,6 +17,7 @@
if [ "$CONFIG_PCI" != "n" ]; then
bool ' CardBus support' CONFIG_CARDBUS
fi
+ bool ' i82092 compatible bridge support' CONFIG_I82092
bool ' i82365 compatible bridge support' CONFIG_I82365
bool ' Databook TCIC host bridge support' CONFIG_TCIC
if [ "$CONFIG_HD64465" = "y" ]; then
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 2001/11/06 02:57:38 1.2
+++ Makefile 2001/11/06 09:10:22 1.3
@@ -29,6 +29,9 @@
ifeq ($(CONFIG_I82365),y)
obj-y += i82365.o
endif
+ ifeq ($(CONFIG_I82092),y)
+ obj-y += i82092.o
+ endif
ifeq ($(CONFIG_TCIC),y)
obj-y += tcic.o
endif
@@ -40,6 +43,9 @@
obj-m := pcmcia_core.o ds.o
ifeq ($(CONFIG_I82365),y)
obj-m += i82365.o
+ endif
+ ifeq ($(CONFIG_I82092),y)
+ obj-m += i82092.o
endif
ifeq ($(CONFIG_TCIC),y)
obj-m += tcic.o
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:26
|
Update of /cvsroot/linux-mips/linux/Documentation
In directory usw-pr-cvs1:/tmp/cvs-serv23524/Documentation
Modified Files:
Configure.help
Log Message:
Sync with OSS 2.4.14.
Index: Configure.help
===================================================================
RCS file: /cvsroot/linux-mips/linux/Documentation/Configure.help,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Configure.help 2001/11/06 02:57:37 1.4
+++ Configure.help 2001/11/06 09:10:21 1.5
@@ -1412,6 +1412,12 @@
have a high-level driver for the type of device that you want to
support.
+Shuttle EPAT c7/c8 extension
+CONFIG_PARIDE_EPATC8
+ This option enables support for the newer Shuttle EP1284 (aka c7 and
+ c8) chip. You need this if you are using any recent Imation SuperDisk
+ (LS-120) drive.
+
Shuttle EPIA protocol
CONFIG_PARIDE_EPIA
This option enables support for the (obsolete) EPIA parallel port
@@ -1934,6 +1940,20 @@
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
+IRC Send/Chat support
+CONFIG_IP_NF_IRC
+ There is a commonly-used extension to IRC called
+ Direct Client-to-Client Protocol (DCC). This enables users to send
+ files to each other, and also chat to each other without the need
+ of a server. DCC Sending is used anywhere you send files over IRC,
+ and DCC Chat is most commonly used by Eggdrop bots. If you are
+ using NAT, this extension will enable you to send files and initiate
+ chats. Note that you do NOT need this extension to get files or
+ have others initiate chats, or everything else in IRC.
+
+ If you want to compile it as a module, say 'M' here and read
+ Documentation/modules.txt. If unsure, say 'N'.
+
FTP protocol support
CONFIG_IP_NF_FTP
Tracking FTP connections is problematic: special helpers are
@@ -1960,7 +1980,41 @@
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
+CONFIG_IP6_NF_MATCH_LIMIT
+ limit matching allows you to control the rate at which a rule can be
+ matched: mainly useful in combination with the LOG target ("LOG
+ target support", below) and to avoid some Denial of Service attacks.
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+MAC address match support
+CONFIG_IP6_NF_MATCH_MAC
+ mac matching allows you to match packets based on the source
+ ethernet address of the packet.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+Multiple port match support
+CONFIG_IP6_NF_MATCH_MULTIPORT
+ Multiport matching allows you to match TCP or UDP packets based on
+ a series of source or destination ports: normally a rule can only
+ match a single range of ports.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+Owner match support (EXPERIMENTAL)
+CONFIG_IP6_NF_MATCH_OWNER
+ Packet owner matching allows you to match locally-generated packets
+ based on who created them: the user, group, process or session.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+
+
limit match support
CONFIG_IP_NF_MATCH_LIMIT
limit matching allows you to control the rate at which a rule can be
@@ -1996,6 +2050,22 @@
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
+TTL match support
+CONFIG_IP_NF_MATCH_TTL
+ This adds CONFIG_IP_NF_MATCH_TTL option, which enabled the user
+ to match packets by their TTL value.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
+length match support
+CONFIG_IP_NF_MATCH_LENGTH
+ This option allows you to match the length of a packet against a
+ specific value or range of values.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
TOS match support
CONFIG_IP_NF_MATCH_TOS
TOS matching allows you to match packets based on the Type Of
@@ -2075,6 +2145,20 @@
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
+Basic SNMP-ALG support
+CONFIG_IP_NF_NAT_SNMP_BASIC
+
+ This module implements an Application Layer Gateway (ALG) for
+ SNMP payloads. In conjunction with NAT, it allows a network
+ management system to access multiple private networks with
+ conflicting addresses. It works by modifying IP addresses
+ inside SNMP payloads to match IP-layer NAT mapping.
+
+ This is the "basic" form of SNMP-ALG, as described in RFC 2962
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
REDIRECT target support
CONFIG_IP_NF_TARGET_REDIRECT
REDIRECT is a special case of NAT: all incoming connections are
@@ -2215,6 +2299,14 @@
If you want to compile it as a module, say M here and read
Documentation/modules.txt. If unsure, say `N'.
+LOG target support
+CONFIG_IP6_NF_TARGET_LOG
+ This option adds a `LOG' target, which allows you to create rules in
+ any ip6tables table which records the packet header to the syslog.
+
+ If you want to compile it as a module, say M here and read
+ Documentation/modules.txt. If unsure, say `N'.
+
Packet filtering
CONFIG_IP6_NF_FILTER
Packet filtering defines a table `filter', which has a series of
@@ -11159,7 +11251,7 @@
mice, joysticks, graphic tablets, or any other HID based devices
to your computer via USB. You can't use this driver and the
HIDBP (Boot Protocol) keyboard and mouse drivers at the same time.
- More information is available: Documentation/usb/input.txt.
+ More information is available: Documentation/input/input.txt.
If unsure, say Y.
@@ -12183,6 +12275,15 @@
http://www.unicode.org for more information). Say Y here if you want
to be able to read Joliet CDROMs under Linux.
+Transparent decompression extension
+CONFIG_ZISOFS
+ This is a Linux-specific extension to RockRidge which lets you store
+ data in compressed form on a CD-ROM and have it transparently
+ decompressed when the CD-ROM is accessed. See
+ <http://www.kernel.org/pub/linux/utils/fs/zisofs/> for the tools
+ necessary to create such a filesystem. Say Y here if you want to be
+ able to read such compressed CD-ROMs.
+
UDF File System support (read only)
CONFIG_UDF_FS
This is the new file system used on some CDROMs and DVDs. Say Y if
@@ -14979,6 +15080,25 @@
http://www.buzzard.org.uk/toshiba/
Say Y if you intend to run this kernel on a Toshiba portable.
+ Say N otherwise.
+
+Dell Inspiron 8000 support
+CONFIG_I8K
+ This adds a driver to safely access the System Management Mode
+ of the CPU on the Dell Inspiron 8000. The System Management Mode
+ is used to read cpu temperature and cooling fan status and to
+ control the fans on the I8K portables.
+
+ This driver has been tested only on the Inspiron 8000 but it may
+ also work with other Dell laptops. You can force loading on other
+ models by passing the parameter `force=1' to the module. Use at
+ your own risk.
+
+ For information on utilities to make use of this driver see the
+ I8K Linux utilities web site at:
+ http://www.debian.org/~dz/i8k/
+
+ Say Y if you intend to run this kernel on a Dell Inspiron 8000.
Say N otherwise.
/dev/cpu/microcode - Intel IA32 CPU microcode support
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:26
|
Update of /cvsroot/linux-mips/linux/drivers/pci In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/pci Modified Files: pci.ids Log Message: Sync with OSS 2.4.14. Index: pci.ids =================================================================== RCS file: /cvsroot/linux-mips/linux/drivers/pci/pci.ids,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pci.ids 2001/11/06 02:57:38 1.8 +++ pci.ids 2001/11/06 09:10:22 1.9 @@ -1,8 +1,11 @@ # # List of PCI ID's # -# Maintained by Martin Mares <pc...@uc...> -# If you have any new entries, send them to the maintainer. +# Maintained by Martin Mares <mj...@uc...> and other volunteers from the +# Linux PCI ID's Project at http://pciids.sf.net/. New data are always +# welcome (if they are accurate), we're eagerly expecting new entries, +# so if you have anything to contribute, please visit the home page or +# send a diff -u against the most recent pci.ids to pc...@uc.... # # $Id$ # @@ -45,6 +48,7 @@ 8086 002a PCI Hotplug Controller A 8086 002b PCI Hotplug Controller B a0f8 USB Open Host Controller + a0fc Fibre Channel Host Controller ae10 Smart-2/P RAID Controller 0e11 4030 Smart-2/P Array Controller 0e11 4031 Smart-2SL Array Controller @@ -70,6 +74,7 @@ b02f NC1120 Ethernet NIC b030 Netelligent WS 5100 b04a 10/100 TX PCI Intel WOL UTP Controller + b060 Smart Array 5300 Controller b0c6 NC3161 Fast Ethernet NIC b0c7 NC3160 Fast Ethernet NIC b0d7 NC3121 Fast Ethernet NIC @@ -84,6 +89,7 @@ b144 NC3123 Fast Ethernet NIC b163 NC3134 Fast Ethernet NIC b164 NC3135 Fast Ethernet Upgrade Module + b178 Smart Array 5i/532 b1a4 NC7131 Gigabit Server Adapter f130 NetFlex-3/P ThunderLAN 1.0 f150 NetFlex-3/P ThunderLAN 2.3 @@ -179,6 +185,9 @@ 4c52 Rage Mobility P/M 4c53 Rage Mobility L 4c54 264LT [Mach64 LT] + 4c57 Radeon Mobility M6 LW + 4c59 Radeon Mobility M6 LY + 4c5a Radeon Mobility M6 LZ 4d46 Rage Mobility M4 AGP 4d4c Rage Mobility M4 AGP 5041 Rage 128 PA @@ -207,8 +216,15 @@ 5056 Rage 128 PV 5057 Rage 128 PW 5058 Rage 128 PX + 5144 Radeon QD + 5145 Radeon QE + 5146 Radeon QF + 5147 Radeon QG + 5159 Radeon VE QY + 515a Radeon VE QZ 5245 Rage 128 RE 5246 Rage 128 RF + 5247 Rage 128 RG 524b Rage 128 RK 524c Rage 128 RL 5345 Rage 128 SE @@ -218,9 +234,12 @@ 534b Rage 128 SK 534c Rage 128 SL 534d Rage 128 SM - 534e Rage 128 4x + 534e Rage 128 SN 5354 Mach 64 VT 1002 5654 Mach 64 reference + 5446 Rage 128 Pro TF + 544c Rage 128 Pro TL + 5452 Rage 128 Pro TR 5654 264VT [Mach64 VT] 1002 5654 Mach64VT Reference 5655 264VT3 [Mach64 VT3] @@ -274,7 +293,8 @@ 000f OHCI Compliant FireWire Controller 0011 National PCI System I/O 0012 USB Controller - 0020 DP83815 + 0020 DP83815 (MacPhyter) Ethernet Controller + 0022 DP83820 10/100/1000 Ethernet Controller d001 87410 IDE 100c Tseng Labs Inc 3202 ET4000/W32p rev A @@ -348,6 +368,8 @@ 0026 DECchip 21154 0045 DECchip 21553 0046 DECchip 21554 + 103c 10c2 Hewlett-Packard NetRAID-4M + 9005 0365 Adaptec 5400S 9005 1364 Dell PowerEdge RAID Controller 2 9005 1365 Dell PowerEdge RAID Controller 2 1065 StrongARM DC21285 @@ -431,12 +453,12 @@ 007c ATM Controller (14107c00) 007d 3780IDSP [MWave] 0090 GXT 3000P - 1014 008E GXT-3000P + 1014 008e GXT-3000P 0095 20H2999 PCI Docking Bridge 0096 Chukar chipset SCSI controller - 1014 0099 iSeries 2748 DASD IOA - 1014 0098 iSeries 2763 DASD IOA 1014 0097 iSeries 2778 DASD IOA + 1014 0098 iSeries 2763 DASD IOA + 1014 0099 iSeries 2748 DASD IOA 00a5 ATM Controller (1410a500) 00a6 ATM 155MBPS MM Controller (1410a600) 00b7 256-bit Graphics Rasterizer [Fire GL1] @@ -504,8 +526,8 @@ 2040 79c974 7006 AMD-751 [Irongate] System Controller 7007 AMD-751 [Irongate] AGP Bridge - 700E AMD-760 [Irongate] System Controller - 700F AMD-760 [Irongate] AGP Bridge + 700e AMD-760 [Irongate] System Controller + 700f AMD-760 [Irongate] AGP Bridge 7400 AMD-755 [Cobra] ISA 7401 AMD-755 [Cobra] IDE 7403 AMD-755 [Cobra] ACPI @@ -564,6 +586,8 @@ 9850 3DImage 9850 9880 Blade 3D PCI/AGP 1023 9880 Blade 3D + 9910 CyberBlade/XP + 9930 CyberBlade/XPm 1024 Zenith Data Systems 1025 Acer Incorporated [ALI] 1435 M1435 @@ -634,7 +658,7 @@ 0000 HYDRA 0010 ASPEN 102b Matrox Graphics, Inc. -#DJ: I've a suspicion that 0010 is a duplicate of 0d10. +# DJ: I've a suspicion that 0010 is a duplicate of 0d10. 0010 MGA-I [Impression?] 0518 MGA-II [Athena] 0519 MGA 2064W [Millennium] @@ -683,7 +707,22 @@ 102b 0328 Millennium G400 16Mb SDRAM 102b 0338 Millennium G400 16Mb SDRAM 102b 0378 Millennium G400 32Mb SDRAM + 102b 0541 Millennium G450 Dual Head + 102b 0542 Millennium G450 Dual Head LX 102b 0641 Millennium G450 32Mb SDRAM + 102b 0642 Millennium G450 32Mb SDRAM Dual Head LX + 102b 07c0 Millennium G450 Dual Head LE + 102b 07c1 Millennium G450 SDR Dual Head + 102b 0d41 Millennium G450 Dual Head PCI + 102b 0d42 Millennium G450 Dual Head LX PCI + 102b 0e00 Marvel G450 eTV + 102b 0e01 Marvel G450 eTV + 102b 0e02 Marvel G450 eTV + 102b 0e03 Marvel G450 eTV + 102b 0f80 Millennium G450 Low Profile + 102b 0f81 Millennium G450 Low Profile + 102b 0f82 Millennium G450 Low Profile DVI + 102b 0f83 Millennium G450 Low Profile DVI 102b 19d8 Millennium G400 16Mb SGRAM 102b 19f8 Millennium G400 32Mb SGRAM 102b 2159 Millennium G400 Dual Head 16Mb @@ -692,6 +731,7 @@ 102b 2f58 Millennium G400 102b 2f78 Millennium G400 102b 3693 Marvel G400 AGP + 1705 0001 Millennium G450 32MB SGRAM b16f 0e11 Matrox MGA-G400 AGP 0d10 MGA Ultima/Impression 1000 MGA G100 [Productiva] @@ -1017,8 +1057,7 @@ 9462 USB Universal Host Controller [OHCI] 9463 Power Management Controller [Bridge] 1056 ICL -# Motorola made a mistake and used 1507 instead of 1057 in some chips. -# Please look at the 1507 entry as well when updating this. +# Motorola made a mistake and used 1507 instead of 1057 in some chips. Please look at the 1507 entry as well when updating this. 1057 Motorola 0001 MPC105 [Eagle] 0002 MPC106 [Grackle] @@ -1285,6 +1324,7 @@ 1092 Diamond Multimedia Systems 00a0 Speedstar Pro SE 00a8 Speedstar 64 + 0550 Viper V550 08d4 Supra 2260 Modem 1092 Viper V330 6120 Maximum DVD @@ -1561,8 +1601,6 @@ 10b7 3590 TokenLink Velocity XL Adapter 4500 3c450 Cyclone/unknown 5055 3c555 Laptop Hurricane - 6055 3c556 Laptop Hurricane - 6056 3c556B Laptop Hurricane 5057 3c575 [Megahertz] 10/100 LAN CardBus 10b7 5a57 3C575 Megahertz 10/100 LAN Cardbus PC Card 5157 3c575 [Megahertz] 10/100 LAN CardBus @@ -1576,6 +1614,8 @@ 5970 3c597 EISA Fast Demon/Vortex 5b57 3c595 [Megahertz] 10/100 LAN CardBus 10b7 5b57 3C575 Megahertz 10/100 LAN Cardbus PC Card + 6055 3c556 Hurricane CardBus + 6056 3c556B Hurricane CardBus 6560 3CCFE656 Cyclone CardBus 6562 3CCFEM656 [id 6562] Cyclone CardBus 6564 3CCFEM656 [id 6564] Cyclone CardBus @@ -1686,6 +1726,7 @@ 5237 M5237 USB 5243 M5243 5247 M5247 + 5451 M5451 PCI South Bridge Audio 7101 M7101 PMU 10b9 7101 ALI M7101 Power Management Controller 10ba Mitsubishi Electric Corp. @@ -1732,6 +1773,7 @@ 0006 NM2360 [MagicMedia 256ZX] 0016 NM2380 [MagicMedia 256XL+] 10c8 0016 MagicMedia 256XL+ + 0025 [MagicMedia 256AV+] 0083 [MagicGraph 128ZV Plus] 8005 [MagicMedia 256AV Audio] 0e11 b0d1 MagicMedia 256AV Audio Device on Discovery @@ -1756,6 +1798,7 @@ 1300 ABP940-U / ABP960-U 10cd 1310 ASC1300 SCSI Adapter 2300 ABP940-UW + 2500 ABP940-U2W 10ce Radius 10cf Citicorp TTI 2001 mb86605 @@ -1865,11 +1908,12 @@ 0111 NV11 (GeForce2 MX DDR) 0112 GeForce2 Go 0113 NV11 (GeForce2 MXR) - 0150 NV15 (Geforce2 Pro) + 0150 NV15 (GeForce2 Pro) 107d 2840 WinFast GeForce2 GTS with TV output - 0151 NV15 DDR (Geforce2 GTS) - 0152 NV15 Bladerunner (Geforce2 Ultra) + 0151 NV15 DDR (GeForce2 GTS) + 0152 NV15 Bladerunner (GeForce2 Ultra) 0153 NV15 GL (Quadro2 Pro) + 0200 NV20 (GeForce3) 0203 Quadro DCC 10df Emulex Corporation 10df Light Pulse Fibre Channel Adapter @@ -1895,7 +1939,7 @@ 10e5 Micro Industries Corporation 10e6 Gainbery Computer Products Inc. 10e7 Vadem -10e8 Applied Micro Circuits Corporation +10e8 Applied Micro Circuits Corp. 2011 Q-Motion Video Capture/Edit board 4750 S5930 [Matchmaker] 5920 S5920 @@ -1909,7 +1953,7 @@ 80d9 PCI-9118 80da PCI-9812 811a PCI-IEEE1355-DS-DE Interface - 8170 S5933 "Matchmaker" [PCI Chipset Development Tool] + 8170 S5933 [Matchmaker] (Chipset Development Tool) 10e9 Alps Electric Co., Ltd. 10ea Intergraphics Systems 1680 IGA-1680 @@ -2004,6 +2048,7 @@ 1102 8051 CT4850 SBLive! Value 7002 SB Live! 1102 0020 Gameport Joystick + 8938 ES1371 1103 Triones Technologies, Inc. 0003 HPT343 0004 HPT366 / HPT370 @@ -2075,9 +2120,9 @@ 8598 VT82C598/694x [Apollo MVP3/Pro133x AGP] 8601 VT8601 [Apollo ProMedia AGP] 8605 VT8605 [PM133 AGP] + 8691 VT82C691 [Apollo Pro] b091 VT8633 [Apollo Pro266 AGP] b099 VT8367 [KT266 AGP] - 8691 VT82C691 [Apollo Pro] 1107 Stratus Computers 0576 VIA VT82C570MV [Apollo] (Wrong vendor ID!) 1108 Proteon, Inc. @@ -2107,7 +2152,7 @@ 6037 Firepower Powerized SMP I/O ASIC 6073 Firepower Powerized SMP I/O ASIC 1111 Santa Cruz Operation -# DJ- Some people say that 0x1112 is Rockwell International ? +# DJ: Some people say that 0x1112 is Rockwell International 1112 RNS - Div. of Meret Communications Inc 2200 FDDI Adapter 2300 Fast Ethernet Adapter @@ -2117,6 +2162,7 @@ 1211 SMC2-1211TX 103c 1207 EN-1207D Fast Ethernet Adapter 1113 1211 EN-1207D Fast Ethernet Adapter + 1216 EN-1216 Ethernet Adapter 1217 EN-1217 Ethernet Adapter 5105 10Mbps Network card 9211 EN-1207D Fast Ethernet Adapter @@ -2166,10 +2212,22 @@ 0119 GDT 6128RD/6528RD/6628RD 011a GDT 6538RD/6638RD 011b GDT 6558RD/6658RD + 0120 GDT 6117RP2/6517RP2 + 0121 GDT 6127RP2/6527RP2 + 0122 GDT 6537RP2 + 0123 GDT 6557RP2 + 0124 GDT 6111RP2/6511RP2 + 0125 GDT 6121RP2/6521RP2 + 0136 GDT 6113RS/6513RS + 0137 GDT 6123RS/6523RS 0138 GDT 6118RS/6518RS/6618RS 0139 GDT 6128RS/6528RS/6628RS 013a GDT 6538RS/6638RS 013b GDT 6558RS/6658RS + 013c GDT 6533RS/6633RS + 013d GDT 6543RS/6643RS + 013e GDT 6553RS/6653RS + 013f GDT 6563RS/6663RS 0166 GDT 7113RN/7513RN/7613RN 0167 GDT 7123RN/7523RN/7623RN 0168 GDT 7118RN/7518RN/7518RN @@ -2180,10 +2238,19 @@ 016d GDT 7543RN/7643RN 016e GDT 7553RN/7653RN 016f GDT 7563RN/7663RN + 01d6 GDT 4x13RZ + 01d7 GDT 4x23RZ + 01f6 GDT 8x13RZ + 01f7 GDT 8x23RZ + 01fc GDT 8x33RZ + 01fd GDT 8x43RZ + 01fe GDT 8x53RZ + 01ff GDT 8x63RZ 0210 GDT 6519RD/6619RD 0211 GDT 6529RD/6629RD 0260 GDT 7519RN/7619RN 0261 GDT 7529RN/7629RN + 0300 GDT Raid Controller 111a Efficient Networks, Inc 0000 155P-MF1 (FPGA) 0002 155P-MF1 (ASIC) @@ -2191,8 +2258,8 @@ 111a 0000 ENI-25p Miniport ATM Adapter 0005 SpeedStream (LANAI) 111a 0001 ENI-3010 ATM - 111a 0101 ENI-3010 ATM 111a 0009 ENI-3060 ADSL (VPI=0) + 111a 0101 ENI-3010 ATM 111a 0109 ENI-3060CO ADSL (VPI=0) 111a 0809 ENI-3060 ADSL (VPI=0 or 8) 111a 0909 ENI-3060CO ADSL (VPI=0 or 8) @@ -2275,7 +2342,7 @@ 113c Cyclone Microsystems, Inc. 0000 PCI-9060 i960 Bridge 0001 PCI-SDK [PCI i960 Evaluation Platform] - 0911 PCI-911 [PCI-based i960Jx Intelligent I/O Controller] + 0911 PCI-911 [i960Jx-based Intelligent I/O Controller] 0912 PCI-912 [i960CF-based Intelligent I/O Controller] 0913 PCI-913 0914 PCI-914 [I/O Controller w/ secondary PCI bus] @@ -2466,9 +2533,8 @@ 060f ToPIC97 0617 ToPIC95 PCI to Cardbus Bridge with ZV Support 0618 CPU to PCI and PCI to ISA bridge +# Claimed to be Lucent DSP1645 [Mars], but that's apparently incorrect. Does anyone know the correct ID? 0701 FIR Port -# This is apparently incorrect. Does anyone know the correct ID? -# 0701 Lucent DSP1645 [Mars] 0d01 FIR Port Type-DO 1179 0001 FIR Port Type-DO 117a A-Trend Technology @@ -2490,6 +2556,9 @@ 1185 Dataworld International Ltd 1186 D-Link System Inc 0100 DC21041 + 1002 Sundance Ethernet + 1300 RTL8139 Ethernet + 4000 DL2K Ethernet 1187 Advanced Technology Laboratories, Inc. 1188 Shima Seiki Manufacturing Ltd. 1189 Matsushita Electronics Co Ltd @@ -2975,12 +3044,16 @@ 2120 VideoPlex CC 2130 VideoQuest 1256 Perceptive Solutions, Inc. + 4201 PCI-2220I + 4401 PCI-2240I + 5201 PCI-2000 1257 Vertex Networks, Inc. 1258 Gilbarco, Inc. 1259 Allied Telesyn International 2560 AT-2560 Fast Ethernet Adapter (i82557B) 125a ABB Power Systems 125b Asix Electronics Corporation + 1400 ALFA GFC2204 125c Aurora Technologies, Inc. 125d ESS Technology 0000 ES336H Fax Modem (Early Model) @@ -3227,7 +3300,10 @@ 1280 Photoscript Group Ltd. 1281 Yokogawa Electric Corporation 1282 Davicom Semiconductor, Inc. + 9009 Ethernet 100/10 MBit + 9100 Ethernet 100/10 MBit 9102 Ethernet 100/10 MBit + 9132 Ethernet 100/10 MBit 1283 Integrated Technology Express, Inc. 673a IT8330G 8330 IT8330G @@ -3332,6 +3408,8 @@ 12c1 GMM Research Corp 12c2 Mentec Limited 12c3 Holtek Microelectronics Inc + 0058 PCI NE2K Ethernet + 5598 PCI NE2K Ethernet 12c4 Connect Tech Inc 12c5 Picture Elements Incorporated 0081 PCIVST [Grayscale Thresholding Engine] @@ -3511,7 +3589,9 @@ 1313 Yaskawa Electric Co. 1316 Teradyne Inc 1317 Linksys + 0981 Fast Ethernet 10/100 0985 Network Everywhere Fast Ethernet 10/100 model NC100 + 1985 Fast Ethernet 10/100 1318 Packet Engines Inc. 0911 PCI Ethernet Adapter 1319 Fortemedia, Inc @@ -3671,6 +3751,8 @@ 1384 Reality Simulation Systems Inc 1385 Netgear 620a GA620 + 622a GA622 + 630a GA630 f311 FA311 1386 Video Domain Technologies 1387 Systran Corp @@ -3687,6 +3769,11 @@ 1391 Development Concepts Inc 1392 Medialight Inc 1393 Moxa Technologies Co Ltd + 1040 Smartio C104H/PCI + 1680 Smartio C168H/PCI + 2040 Intellio CP-204J + 2180 Intellio C218 Turbo PCI + 3200 Intellio C320 Turbo PCI 1394 Level One Communications 1395 Ambicom Inc 1396 Cipher Systems Inc @@ -3738,6 +3825,7 @@ 0010 SyncLink WAN Adapter 13c1 3ware Inc 1000 3ware ATA-RAID + 1001 3ware 7000-series ATA-RAID 13c2 Technotrend Systemtechnik GmbH 13c3 Janz Computer AG 13c4 Phase Metrics @@ -3786,7 +3874,8 @@ 13ed Raytheion E-Systems 13ee Hayes Microcomputer Products Inc 13ef Coppercom Inc -13f0 Sundance technology Inc +13f0 Sundance Technology Inc + 0201 Sundance Ethernet 13f1 Oce' - Technologies B.V. 13f2 Ford Microelectronics Inc 13f3 Mcdata Corporation @@ -3810,6 +3899,7 @@ 13fe Advantech Co. Ltd 13ff Silicon Spice Inc 1400 Artx Inc + 1401 9432 TX 1401 CR-Systems A/S 1402 Meilhaus Electronic GmbH 1403 Ascor Inc @@ -3817,6 +3907,14 @@ 1405 Excalibur Systems Inc 1406 Oce' Printing Systems GmbH 1407 Lava Computer mfg Inc + 0100 Lava Dual Serial + 0101 Lava Quatro A + 0102 Lava Quatro B + 0200 Lava Port Plus + 0201 Lava Quad A + 0202 Lava Quad B + 0500 Lava Single Serial + 0600 Lava Port 650 8000 Lava Parallel 8002 Lava Dual Parallel port A 8003 Lava Dual Parallel port B @@ -4077,8 +4175,8 @@ 14e4 0004 NetXtreme 1000BaseTX 14e4 1644 NetXtreme BCM5700 1000BaseTX 1645 NetXtreme BCM5701 Gigabit Ethernet - 0e11 007d NC6770 1000BaseSX 0e11 007c NC7770 1000BaseTX + 0e11 007d NC6770 1000BaseSX 0e11 0085 NC7780 1000BaseTX 10b7 1004 3C996-SX 1000BaseSX 10b7 1006 3C996B-T 1000BaseTX @@ -4090,6 +4188,7 @@ 14e4 0007 NetXtreme BCM5701 1000BaseSX 14e4 0008 NetXtreme BCM5701 1000BaseTX 14e4 8008 NetXtreme BCM5701 1000BaseTX + 1647 NetXtreme BCM5701 Gigabit Ethernet 5820 BCM5820 Crypto Accelerator 14e5 Pixelfusion Ltd 14e6 SHINING Technology Inc @@ -4105,29 +4204,24 @@ 14f0 CANON RESEACH CENTRE FRANCE 14f1 Conexant 1033 HCF 56k Data/Fax Modem - 1033 8077 NEC - 122d 4027 Dell Zeus - MDP3880-W(B) Data Fax Modem # Aztech - 122d 4030 Dell Mercury - MDP3880-U(B) Data Fax Modem # Aztech - 122d 4034 Dell Thor - MDP3880-W(U) Data Fax Modem # Aztech + 122d 4027 Dell Zeus - MDP3880-W(B) Data Fax Modem + 122d 4030 Dell Mercury - MDP3880-U(B) Data Fax Modem + 122d 4034 Dell Thor - MDP3880-W(U) Data Fax Modem 13e0 020d Dell Copper 13e0 020e Dell Silver - 13e0 0261 IBM # GVC 13e0 0290 Compaq Goldwing - 13e0 02a0 IBM # GVC - 13e0 02b0 IBM # GVC 13e0 02c0 Compaq Scooter - 13e0 02d0 IBM # GVC - 144f 1500 IBM P85-DF # Askey - 144f 1501 IBM P85-DF # Askey - 144f 150a IBM P85-DF # Askey - 144f 150b IBM P85-DF Low Profile # Askey - 144f 1510 IBM P85-DF Low Profile # Askey + 144f 1500 IBM P85-DF (1) + 144f 1501 IBM P85-DF (2) + 144f 150a IBM P85-DF (3) + 144f 150b IBM P85-DF Low Profile (1) + 144f 1510 IBM P85-DF Low Profile (2) 1034 HCF 56k Data/Fax/Voice Modem 1035 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem 10cf 1098 Fujitsu P85-DFSV 1036 HCF 56k Data/Fax/Voice/Spkp Modem - 122d 4029 MDP3880SP-W # Aztech - 122d 4031 MDP3880SP-U # Aztech + 122d 4029 MDP3880SP-W + 122d 4031 MDP3880SP-U 13e0 0209 Dell Titanium 13e0 020a Dell Graphite 13e0 0260 Gateway Red Owl @@ -4143,80 +4237,72 @@ 1064 HCF 56k Data/Fax/Voice Modem 1065 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem 1066 HCF 56k Data/Fax/Voice/Spkp Modem - 122d 4033 Dell Athena - MDP3900V-U # Aztech + 122d 4033 Dell Athena - MDP3900V-U 1433 HCF 56k Data/Fax Modem 1434 HCF 56k Data/Fax/Voice Modem 1435 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem 1436 HCF 56k Data/Fax Modem 1453 HCF 56k Data/Fax Modem - 13e0 0240 IBM # GVC - 13e0 0250 IBM # GVC - 144f 1502 IBM P95-DF # Askey - 144f 1503 IBM P95-DF # Askey + 144f 1502 IBM P95-DF (1) + 144f 1503 IBM P95-DF (2) 1454 HCF 56k Data/Fax/Voice Modem 1455 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem 1456 HCF 56k Data/Fax/Voice/Spkp Modem - 122d 4035 Dell Europa - MDP3900V-W # Aztech - 122d 4302 MP3930V-W(C) MiniPCI # Aztech + 122d 4035 Dell Europa - MDP3900V-W + 122d 4302 Dell MP3930V-W(C) MiniPCI 1803 HCF 56k Modem - 0e11 0023 623-LAN Grizzly # Compaq - 0e11 0043 623-LAN Yogi # Compaq + 0e11 0023 623-LAN Grizzly + 0e11 0043 623-LAN Yogi 1815 HCF 56k Modem - 0e11 0022 Grizzly # Compaq - 0e11 0042 Yogi # Compaq + 0e11 0022 Grizzly + 0e11 0042 Yogi 2003 HSF 56k Data/Fax Modem 2004 HSF 56k Data/Fax/Voice Modem 2005 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem 2006 HSF 56k Data/Fax/Voice/Spkp Modem 2013 HSF 56k Data/Fax Modem - 0e11 b195 Bear # Compaq - 0e11 b196 Seminole 1 # Compaq - 0e11 b1be Seminole 2 # Compaq - 1025 8013 Acer - 1033 809d NEC - 1033 80bc NEC + 0e11 b195 Bear + 0e11 b196 Seminole 1 + 0e11 b1be Seminole 2 155d 6793 HP 155d 8850 E Machines 2014 HSF 56k Data/Fax/Voice Modem 2015 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem 2016 HSF 56k Data/Fax/Voice/Spkp Modem - 2043 HSF 56k Data/Fax Modem (Worldwide SmartDAA) - 2044 HSF 56k Data/Fax/Voice Modem (Worldwide SmartDAA) - 2045 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (Worldwide SmartDAA) - 2046 HSF 56k Data/Fax/Voice/Spkp Modem (Worldwide SmartDAA) + 2043 HSF 56k Data/Fax Modem (WorldW SmartDAA) + 2044 HSF 56k Data/Fax/Voice Modem (WorldW SmartDAA) + 2045 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (WorldW SmartDAA) + 2046 HSF 56k Data/Fax/Voice/Spkp Modem (WorldW SmartDAA) 2063 HSF 56k Data/Fax Modem (SmartDAA) 2064 HSF 56k Data/Fax/Voice Modem (SmartDAA) 2065 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (SmartDAA) 2066 HSF 56k Data/Fax/Voice/Spkp Modem (SmartDAA) 2093 HSF 56k Modem 155d 2f07 Legend - 2143 HSF 56k Data/Fax/Cell Modem (Mobile Worldwide SmartDAA) - 2144 HSF 56k Data/Fax/Voice/Cell Modem (Mobile Worldwide SmartDAA) - 2145 HSF 56k Data/Fax/Voice/Spkp (w/HS)/Cell Modem (Mob WW SmartDAA) - 2146 HSF 56k Data/Fax/Voice/Spkp/Cell Modem (Mobile Worldwide SmartDAA) - 2163 HSF 56k Data/Fax/Cell Modem (Mobile SmartDAA) - 2164 HSF 56k Data/Fax/Voice/Cell Modem (Mobile SmartDAA) - 2165 HSF 56k Data/Fax/Voice/Spkp (w/Handset)/Cell Modem (Mobile SmartDAA) - 2166 HSF 56k Data/Fax/Voice/Spkp/Cell Modem (Mobile SmartDAA) - 2343 HSF 56k Data/Fax CardBus Modem (Mobile Worldwide SmartDAA) - 2344 HSF 56k Data/Fax/Voice CardBus Modem (Mobile Worldwide SmartDAA) - 2345 HSF 56k Data/Fax/Voice/Spkp (w/HS) CardBus Modem (Mob WW SmartDAA) - 2346 HSF 56k Data/Fax/Voice/Spkp CardBus Modem (Mobile Worldwide SmartDAA) - 2363 HSF 56k Data/Fax CardBus Modem (Mobile SmartDAA) - 2364 HSF 56k Data/Fax/Voice CardBus Modem (Mobile SmartDAA) + 2143 HSF 56k Data/Fax/Cell Modem (Mob WorldW SmartDAA) + 2144 HSF 56k Data/Fax/Voice/Cell Modem (Mob WorldW SmartDAA) + 2145 HSF 56k Data/Fax/Voice/Spkp (w/HS)/Cell Modem (Mob WorldW SmartDAA) + 2146 HSF 56k Data/Fax/Voice/Spkp/Cell Modem (Mob WorldW SmartDAA) + 2163 HSF 56k Data/Fax/Cell Modem (Mob SmartDAA) + 2164 HSF 56k Data/Fax/Voice/Cell Modem (Mob SmartDAA) + 2165 HSF 56k Data/Fax/Voice/Spkp (w/HS)/Cell Modem (Mob SmartDAA) + 2166 HSF 56k Data/Fax/Voice/Spkp/Cell Modem (Mob SmartDAA) + 2343 HSF 56k Data/Fax CardBus Modem (Mob WorldW SmartDAA) + 2344 HSF 56k Data/Fax/Voice CardBus Modem (Mob WorldW SmartDAA) + 2345 HSF 56k Data/Fax/Voice/Spkp (w/HS) CardBus Modem (Mob WorldW SmartDAA) + 2346 HSF 56k Data/Fax/Voice/Spkp CardBus Modem (Mob WorldW SmartDAA) + 2363 HSF 56k Data/Fax CardBus Modem (Mob SmartDAA) + 2364 HSF 56k Data/Fax/Voice CardBus Modem (Mob SmartDAA) 2365 HSF 56k Data/Fax/Voice/Spkp (w/HS) CardBus Modem (Mob SmartDAA) - 2366 HSF 56k Data/Fax/Voice/Spkp CardBus Modem (Mobile SmartDAA) - 2443 HSF 56k Data/Fax Modem (Mobile Worldwide SmartDAA) - 104d 8075 Modem # Sony - 104d 8083 Modem # Sony - 104d 8097 Modem # Sony - 2444 HSF 56k Data/Fax/Voice Modem (Mobile Worldwide SmartDAA) - 2445 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mobile WW SmartDAA) - 2446 HSF 56k Data/Fax/Voice/Spkp Modem (Mobile Worldwide SmartDAA) - 2463 HSF 56k Data/Fax Modem (Mobile SmartDAA) - 2464 HSF 56k Data/Fax/Voice Modem (Mobile SmartDAA) - 2465 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (Mobile SmartDAA) - 2466 HSF 56k Data/Fax/Voice/Spkp Modem (Mobile SmartDAA) + 2366 HSF 56k Data/Fax/Voice/Spkp CardBus Modem (Mob SmartDAA) + 2443 HSF 56k Data/Fax Modem (Mob WorldW SmartDAA) + 2444 HSF 56k Data/Fax/Voice Modem (Mob WorldW SmartDAA) + 2445 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob WorldW SmartDAA) + 2446 HSF 56k Data/Fax/Voice/Spkp Modem (Mob WorldW SmartDAA) + 2463 HSF 56k Data/Fax Modem (Mob SmartDAA) + 2464 HSF 56k Data/Fax/Voice Modem (Mob SmartDAA) + 2465 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob SmartDAA) + 2466 HSF 56k Data/Fax/Voice/Spkp Modem (Mob SmartDAA) 2f00 HSF 56k HSFi Modem 13e0 8d84 IBM HSFi V.90 13e0 8d85 Compaq Stinger @@ -4241,9 +4327,7 @@ 1504 KAISER Electronics 1505 ITA INGENIEURBURO FUR TESTAUFGABEN GmbH 1506 CHAMELEON Systems Inc -# 1507 HTEC Ltd -# Commented out because there are no known HTEC chips and 1507 is already -# used by mistake by Motorola (see vendor ID 1057) +# Should be HTEC Ltd, but there are no known HTEC chips and 1507 is already used by mistake by Motorola (see vendor ID 1057). 1507 Motorola ?? / HTEC 0001 MPC105 [Eagle] 0002 MPC106 [Grackle] @@ -4618,8 +4702,11 @@ 4000 ALS4000 Audio Chipset 4005 4000 ALS4000 Audio Chipset 4033 Addtron Technology Co, Inc. + 1360 RTL8139 Ethernet 4143 Digital Equipment Corp 416c Aladdin Knowledge Systems + 0100 AladdinCARD + 0200 CPC 4444 Internext Compression Inc 4468 Bridgeport machines 4594 Cogetec Informatique Inc @@ -4784,7 +4871,7 @@ 8008 Quancom Electronic GmbH 0010 WDOG1 [PCI-Watchdog 1] 0011 PWDOG2 [PCI-Watchdog 2] -8086 Intel Corporation +8086 Intel Corp. 0007 82379AB 0039 21145 0122 82437FX @@ -4794,6 +4881,7 @@ 0486 82430ZX [Aries] 04a3 82434LX [Mercury/Neptune] 04d0 82437FX [Triton FX] + 0600 RAID Controller 0960 80960RP [i960 RP Microprocessor/Bridge] 0964 80960RP [i960 RP Microprocessor/Bridge] 1000 82542 Gigabit Ethernet Controller @@ -4804,8 +4892,10 @@ 1001 82543GC Gigabit Ethernet Controller 1004 82543GC Gigabit Ethernet Controller 1008 82544EI Gigabit Ethernet Controller + 1009 82544EI Gigabit Ethernet Controller 100c 82544GC Gigabit Ethernet Controller 100d 82544GC Gigabit Ethernet Controller + 1029 82559 Ethernet Controller 1030 82559 InBusiness 10/100 1031 82801CAM (ICH3) Chipset Ethernet Controller 1032 82801CAM (ICH3) Chipset Ethernet Controller @@ -4877,8 +4967,8 @@ 122e 82371FB PIIX ISA [Triton I] 1230 82371FB PIIX IDE [Triton I] 1231 DSVD Modem - 1234 430MX - 82371MX MPIIX [430MX PCIset - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX)] - 1235 430MX - 82437MX MTSC [430MX PCIset - 82437MX Mobile System Controller (MTSC) and 82438MX Mobile Data Path (MTDP)] + 1234 430MX - 82371MX Mobile PCI I/O IDE Xcelerator (MPIIX) + 1235 430MX - 82437MX Mob. System Ctrlr (MTSC) & 82438MX Data Path (MTDP) 1237 440FX - 82441FX PMC [Natoma] 1239 82371FB 123b 82380PB @@ -4893,10 +4983,13 @@ 101e 0438 MegaRaid 438 101e 0466 MegaRaid 466 101e 0467 MegaRaid 467 + 101e 09a0 PowerEdge Expandable RAID Controller 2/SC 1028 0467 PowerEdge Expandable RAID Controller 2/DC 1028 1111 PowerEdge Expandable RAID Controller 2/SC + 103c 03a2 MegaRaid 103c 10c6 MegaRaid 438 103c 10c7 MegaRaid T5 + 103c 10cc MegaRaid 1111 1111 MegaRaid 466 113c 03a2 MegaRaid 1a21 82840 840 (Carmel) Chipset Host Bridge (Hub A) @@ -4935,6 +5028,7 @@ 244b 82820 820 (Camino 2) Chipset IDE U100 244c 82820 820 (Camino 2) Chipset ISA Bridge (ICH2-M) 244e 82820 820 (Camino 2) Chipset PCI + 2485 AC'97 Audio Controller 2500 82820 820 (Camino) Chipset Host Bridge (MCH) 1043 801c P3C-2000 system chipset 2501 82820 820 (Camino) Chipset Host Bridge (MCH) @@ -4947,6 +5041,7 @@ 2531 82850 860 (Wombat) Chipset Host Bridge (MCH) 2532 82850 850 (Tehama) Chipset AGP Bridge 2533 82860 860 (Wombat) Chipset AGP Bridge + 3092 Integrated RAID 5200 EtherExpress PRO/100 Intelligent Server 5201 EtherExpress PRO/100 Intelligent Server 8086 0001 EtherExpress PRO/100 Server Ethernet Adapter @@ -5002,6 +5097,10 @@ 84e2 460GX - 84460GX AGP Bridge (GXB) 84e3 460GX - 84460GX Memory Address Controller (MAC) 84e4 460GX - 84460GX Memory Data Controller (MDC) + 9621 Integrated RAID + 9622 Integrated RAID + 9641 Integrated RAID + 96a1 Integrated RAID ffff 450NX/GX [Orion] - 82453KX/GX Memory controller [BUG] 8800 Trigem Computer Inc. 2008 Video assistent component @@ -5011,7 +5110,6 @@ 8e2e KTI 3000 ET32P2 9004 Adaptec -# FIXME: [dj] In one document I have, lot of these AIC's are actually AHA's 1078 AIC-7810 1160 AIC-1160 [Family Fibre Channel Adapter] 2178 AIC-7821 @@ -5066,8 +5164,9 @@ 7278 AHA-3940 / AIC-7872 7378 AHA-3985 / AIC-7873 7478 AHA-2944 / AIC-7874 -# FIXME: [dj] Where did the 3rd number come from in 0x7578 & 0x7678 ? +# DJ: Where did the 3rd number come from? 7578 AHA-3944 / AHA-3944W / 7875 +# DJ: Where did the 3rd number come from? 7678 AHA-4944W/UW / 7876 7778 AIC-787x 7810 AIC-7810 @@ -5313,7 +5412,7 @@ 00 UHCI 10 OHCI 80 Unspecified - Fe USB Device + fe USB Device 04 Fibre Channel 05 SMBus 06 InfiniBand |
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:26
|
Update of /cvsroot/linux-mips/linux/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/sound
Modified Files:
nec_vrc5477.c
Log Message:
Sync with OSS 2.4.14.
Index: nec_vrc5477.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/sound/nec_vrc5477.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nec_vrc5477.c 2001/11/06 02:57:38 1.5
+++ nec_vrc5477.c 2001/11/06 09:10:22 1.6
@@ -1787,6 +1787,7 @@
MODULE_AUTHOR("Monta Vista Software, js...@mv... or js...@ju...");
MODULE_DESCRIPTION("NEC Vrc5477 audio (AC97) Driver");
+MODULE_LICENSE("GPL");
/* --------------------------------------------------------------------- */
extern void jsun_scan_pci_bus(void);
|
|
From: Paul M. <le...@us...> - 2001-11-06 09:10:25
|
Update of /cvsroot/linux-mips/linux/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/net
Modified Files:
ioc3-eth.c sgiseeq.c
Log Message:
Sync with OSS 2.4.14.
Index: ioc3-eth.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/ioc3-eth.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ioc3-eth.c 2001/10/19 21:19:39 1.5
+++ ioc3-eth.c 2001/11/06 09:10:21 1.6
@@ -1817,8 +1817,7 @@
MODULE_AUTHOR("Ralf Baechle <ra...@os...>");
MODULE_DESCRIPTION("SGI IOC3 Ethernet driver");
+MODULE_LICENSE("GPL");
module_init(ioc3_init_module);
module_exit(ioc3_cleanup_module);
-
-MODULE_LICENSE("GPL");
Index: sgiseeq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/sgiseeq.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sgiseeq.c 2001/10/08 16:31:35 1.3
+++ sgiseeq.c 2001/11/06 09:10:21 1.4
@@ -4,6 +4,7 @@
* Copyright (C) 1996 David S. Miller (dm...@en...)
*/
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/sched.h>
#include <linux/types.h>
#include <linux/interrupt.h>
@@ -722,3 +723,5 @@
(struct sgiseeq_regs *) (KSEG1ADDR(0x1fbd4000)),
&hpc3c0->ethregs, SGI_ENET_IRQ);
}
+
+MODULE_LICENSE("GPL");
|
582 messages has been excluded from this view by a project administrator.
