patch-2.1.132 linux/drivers/acorn/block/ide-ics.c
Next file: linux/drivers/acorn/char/Config.in
Previous file: linux/arch/sparc64/kernel/Makefile
Back to the patch index
Back to the overall index
- Lines: 43
- Date:
Thu Dec 17 09:07:45 1998
- Orig file:
v2.1.131/linux/drivers/acorn/block/ide-ics.c
- Orig date:
Wed Sep 9 14:51:06 1998
diff -u --recursive --new-file v2.1.131/linux/drivers/acorn/block/ide-ics.c linux/drivers/acorn/block/ide-ics.c
@@ -27,6 +27,7 @@
#define ICS_IDENT_OFFSET 0x8a0
+#define ICS_ARCIN_V5_INTRSTAT 0x000
#define ICS_ARCIN_V5_INTROFFSET 0x001
#define ICS_ARCIN_V5_IDEOFFSET 0xa00
#define ICS_ARCIN_V5_IDEALTOFFSET 0xae0
@@ -34,9 +35,11 @@
#define ICS_ARCIN_V6_IDEOFFSET_1 0x800
#define ICS_ARCIN_V6_INTROFFSET_1 0x880
+#define ICS_ARCIN_V6_INTRSTAT_1 0x8a4
#define ICS_ARCIN_V6_IDEALTOFFSET_1 0x8e0
#define ICS_ARCIN_V6_IDEOFFSET_2 0xc00
#define ICS_ARCIN_V6_INTROFFSET_2 0xc80
+#define ICS_ARCIN_V6_INTRSTAT_2 0xca4
#define ICS_ARCIN_V6_IDEALTOFFSET_2 0xce0
#define ICS_ARCIN_V6_IDESTEPPING 4
@@ -199,6 +202,8 @@
case ics_if_arcin_v5:
port = ecard_address (ec, ECARD_MEMC, 0);
+ ec->irqaddr = ioaddr(port + ICS_ARCIN_V5_INTRSTAT);
+ ec->irqmask = 1;
ec->irq_data = (void *)port;
ec->ops = (expansioncard_ops_t *)&icside_ops_arcin_v5;
@@ -210,10 +215,13 @@
port + ICS_ARCIN_V5_IDEALTOFFSET,
ICS_ARCIN_V5_IDESTEPPING,
ec->irq);
+ result[index][1] = -1;
break;
case ics_if_arcin_v6:
port = ecard_address (ec, ECARD_IOC, ECARD_FAST);
+ ec->irqaddr = ioaddr(port + ICS_ARCIN_V6_INTRSTAT_1);
+ ec->irqmask = 1;
ec->irq_data = (void *)port;
ec->ops = (expansioncard_ops_t *)&icside_ops_arcin_v6;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov