diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/net/stnic.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'drivers/net/stnic.c')
| -rw-r--r-- | drivers/net/stnic.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/stnic.c b/drivers/net/stnic.c index 991b21258..9e08c0c9a 100644 --- a/drivers/net/stnic.c +++ b/drivers/net/stnic.c @@ -175,7 +175,7 @@ stnic_reset (struct net_device *dev) *(vhalf *) PA_83902_RST = 0; udelay (5); if (ei_debug > 1) - printk("8390 reset done (%ld).", jiffies); + printk("8390 reset done (%ld).\n", jiffies); *(vhalf *) PA_83902_RST = ~0; udelay (5); } @@ -253,9 +253,17 @@ static void stnic_block_output (struct net_device *dev, int length, const unsigned char *buf, int output_page) { - +#if 0 STNIC_WRITE (PG0_RBCR0, 1); STNIC_WRITE (STNIC_CR, CR_RRD | CR_PG0 | CR_STA); +#else /* XXX: I don't know why but this works. -- gniibe */ + STNIC_WRITE (PG0_RBCR0, 0x42); + STNIC_WRITE (PG0_RBCR1, 0x00); + STNIC_WRITE (PG0_RBCR0, 0x42); + STNIC_WRITE (PG0_RBCR1, 0x00); + STNIC_WRITE (STNIC_CR, CR_RRD | CR_PG0 | CR_STA); + STNIC_DELAY (); +#endif STNIC_WRITE (PG0_RSAR0, 0); STNIC_WRITE (PG0_RSAR1, output_page); @@ -300,3 +308,6 @@ do_stnic_intr (int irq, void *dev_id, struct pt_regs *regs) } module_init(stnic_probe); +/* No cleanup routine - if there were one, it should do a: + unload_8390_module() +*/ |