patch-2.4.2 linux/drivers/scsi/aha1542.c

• Lines: 56
• Date: Tue Feb 13 14:13:44 2001
• Orig file: v2.4.1/linux/drivers/scsi/aha1542.c
• Orig date: Thu Nov 23 09:33:36 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/scsi/aha1542.c linux/drivers/scsi/aha1542.c
@@ -136,6 +136,18 @@
 int aha1542[] = {0x330, 11, 4, -1};
 MODULE_PARM(aha1542, "1-4i");
 MODULE_PARM(isapnp, "i");
+
+static struct isapnp_device_id id_table[] __devinitdata = {
+	{
+		ISAPNP_ANY_ID, ISAPNP_ANY_ID,
+		ISAPNP_VENDOR('A', 'D', 'P'), ISAPNP_FUNCTION(0x1542),
+		0
+	},
+	{0}
+};
+
+MODULE_DEVICE_TABLE(isapnp, id_table);
+
 #else
 int isapnp=1;
 #endif
@@ -947,11 +959,12 @@
 	return 0;
 }
 
-/* called from init/main.c */
+#ifndef MODULE
+static int setup_idx = 0;
+
 void __init aha1542_setup(char *str, int *ints)
 {
 	const char *ahausage = "aha1542: usage: aha1542=<PORTBASE>[,<BUSON>,<BUSOFF>[,<DMASPEED>]]\n";
-	static int setup_idx = 0;
 	int setup_portbase;
 
 	if (setup_idx >= MAXBOARDS) {
@@ -1004,6 +1017,21 @@
 
 	++setup_idx;
 }
+
+static int __init do_setup(char *str)
+{
+	int ints[4];
+
+	int count=setup_idx;
+
+	get_options(str, sizeof(ints)/sizeof(int), ints);
+	aha1542_setup(str,ints);
+
+	return count<setup_idx;
+}
+
+__setup("aha1542=",do_setup);
+#endif
 
 /* return non-zero on detection */
 int aha1542_detect(Scsi_Host_Template * tpnt)