Browse Source
* merged r20081, r20084 from linux-2.6.19.2 branch git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20548 10447126-35f2-4685-b0cf-6dd780d3921fearly
Christian Wiese
19 years ago
4 changed files with 19 additions and 95 deletions
@ -1,7 +1,8 @@
|
||||
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# T2 SDE: package/.../linux26/adaptec-usbxchange.patch
|
||||
# Filename: package/.../linux26/adaptec-usbxchange.patch
|
||||
# Copyright (C) 2007 The OpenSDE Project
|
||||
# Copyright (C) 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
@ -12,8 +13,7 @@
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- T2-COPYRIGHT-NOTE-END ---
|
||||
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Support for the Adaptec USB*Xchange family of USB<->SCSI cables.
|
||||
|
||||
@ -46,12 +46,13 @@ Support for the Adaptec USB*Xchange family of USB<->SCSI cables.
|
||||
ifneq ($(CONFIG_USB_LIBUSUAL),)
|
||||
obj-$(CONFIG_USB) += libusual.o
|
||||
endif
|
||||
--- linux-2.6.15-mm4/drivers/usb/storage/initializers.c 2006-01-30 12:16:10.826446500 +0100
|
||||
+++ linux-2.6.15-usb2x/drivers/usb/storage/initializers.c 2006-01-30 12:08:09.340355500 +0100
|
||||
@@ -164,3 +164,27 @@
|
||||
return USB_STOR_TRANSPORT_FAILED;
|
||||
}
|
||||
--- linux-2.6.19/drivers/usb/storage/initializers.c.vanilla 2006-11-30 09:14:20.000000000 +0100
|
||||
+++ linux-2.6.19/drivers/usb/storage/initializers.c 2006-11-30 09:14:55.000000000 +0100
|
||||
@@ -91,3 +91,28 @@
|
||||
|
||||
return (res ? -1 : 0);
|
||||
}
|
||||
+
|
||||
+/* Firmware Initialisation for the Adaptec USB2Xchange, needed for
|
||||
+ * to recognize devices properly. René Rebe <[email protected]> */
|
||||
+int usb2xchange_init(struct us_data *us)
|
||||
@ -78,10 +79,9 @@ Support for the Adaptec USB*Xchange family of USB<->SCSI cables.
|
||||
+}
|
||||
--- linux-2.6.15-mm4/drivers/usb/storage/initializers.h 2006-01-30 12:16:10.826446500 +0100
|
||||
+++ linux-2.6.15-usb2x/drivers/usb/storage/initializers.h 2006-01-30 12:04:35.110967000 +0100
|
||||
@@ -49,3 +49,6 @@
|
||||
@@ -48,2 +48,5 @@
|
||||
* flash reader */
|
||||
int usb_stor_ucr61s2b_init(struct us_data *us);
|
||||
int rio_karma_init(struct us_data *us);
|
||||
+
|
||||
+/* Firmware Initialization for the Adaptec USB2Xchange */
|
||||
+int usb2xchange_init(struct us_data *us);
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../linux26/initio-export-id-table.patch
|
||||
# Copyright (C) 2006 The OpenSDE Project
|
||||
# Copyright (C) 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Minimal updates to export the device table in the module, the driver should
|
||||
be updated further.
|
||||
|
||||
- Rene Rebe <[email protected]>
|
||||
|
||||
--- linux-2.6.18/drivers/scsi/initio.c.orig 2006-09-20 05:42:06.000000000 +0200
|
||||
+++ linux-2.6.18/drivers/scsi/initio.c 2006-09-20 17:33:56.000000000 +0200
|
||||
@@ -155,11 +155,6 @@
|
||||
|
||||
#define TUL_RDWORD(x,y) (short)(inl((int)((ULONG)((ULONG)x+(UCHAR)y)) ))
|
||||
|
||||
-typedef struct PCI_ID_Struc {
|
||||
- unsigned short vendor_id;
|
||||
- unsigned short device_id;
|
||||
-} PCI_ID;
|
||||
-
|
||||
static int tul_num_ch = 4; /* Maximum 4 adapters */
|
||||
static int tul_num_scb;
|
||||
static int tul_tag_enable = 1;
|
||||
@@ -171,12 +166,13 @@
|
||||
|
||||
static void i91uSCBPost(BYTE * pHcb, BYTE * pScb);
|
||||
|
||||
-static const PCI_ID i91u_pci_devices[] = {
|
||||
- { INI_VENDOR_ID, I950_DEVICE_ID },
|
||||
- { INI_VENDOR_ID, I940_DEVICE_ID },
|
||||
- { INI_VENDOR_ID, I935_DEVICE_ID },
|
||||
- { INI_VENDOR_ID, I920_DEVICE_ID },
|
||||
- { DMX_VENDOR_ID, I920_DEVICE_ID },
|
||||
+static struct pci_device_id i91u_pci_tbl[] = {
|
||||
+ { INI_VENDOR_ID, I950_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
+ { INI_VENDOR_ID, I940_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
+ { INI_VENDOR_ID, I935_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
+ { INI_VENDOR_ID, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
+ { DMX_VENDOR_ID, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
|
||||
+ { 0 }
|
||||
};
|
||||
|
||||
#define DEBUG_INTERRUPT 0
|
||||
@@ -2769,9 +2765,9 @@
|
||||
|
||||
init_i91uAdapter_table();
|
||||
|
||||
- for (i = 0; i < ARRAY_SIZE(i91u_pci_devices); i++)
|
||||
+ for (i = 0; i < ARRAY_SIZE(i91u_pci_tbl); i++)
|
||||
{
|
||||
- while ((pDev = pci_find_device(i91u_pci_devices[i].vendor_id, i91u_pci_devices[i].device_id, pDev)) != NULL) {
|
||||
+ while ((pDev = pci_find_device(i91u_pci_tbl[i].vendor, i91u_pci_tbl[i].device, pDev)) != NULL) {
|
||||
if (pci_enable_device(pDev))
|
||||
continue;
|
||||
pci_read_config_dword(pDev, 0x44, (u32 *) & dRegValue);
|
||||
@@ -3154,6 +3150,8 @@
|
||||
}
|
||||
MODULE_LICENSE("Dual BSD/GPL");
|
||||
|
||||
+MODULE_DEVICE_TABLE(pci, i91u_pci_tbl);
|
||||
+
|
||||
static struct scsi_host_template driver_template = {
|
||||
.proc_name = "INI9100U",
|
||||
.name = i91u_REVID,
|
||||
Loading…
Reference in new issue