Commit 88597364 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa

WAN: remove SCA II support from SCA drivers

Signed-off-by: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
parent 6b40aba3
...@@ -88,7 +88,7 @@ static card_t **new_card = &first_card; ...@@ -88,7 +88,7 @@ static card_t **new_card = &first_card;
/* EDA address register must be set in EDAL, EDAH order - 8 bit ISA bus */ /* EDA address register must be set in EDAL, EDAH order - 8 bit ISA bus */
#define sca_outw(value, reg, card) do { \ #define sca_outw(value, reg, card) do { \
writeb(value & 0xFF, (card)->win0base + C101_SCA + (reg)); \ writeb(value & 0xFF, (card)->win0base + C101_SCA + (reg)); \
writeb((value >> 8 ) & 0xFF, (card)->win0base + C101_SCA + (reg+1));\ writeb((value >> 8 ) & 0xFF, (card)->win0base + C101_SCA + (reg + 1));\
} while(0) } while(0)
#define port_to_card(port) (port) #define port_to_card(port) (port)
...@@ -381,7 +381,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) ...@@ -381,7 +381,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
return result; return result;
} }
sca_init_sync_port(card); /* Set up C101 memory */ sca_init_port(card); /* Set up C101 memory */
set_carrier(card); set_carrier(card);
printk(KERN_INFO "%s: Moxa C101 on IRQ%u," printk(KERN_INFO "%s: Moxa C101 on IRQ%u,"
......
This diff is collapsed.
...@@ -53,7 +53,7 @@ static const char* devname = "RISCom/N2"; ...@@ -53,7 +53,7 @@ static const char* devname = "RISCom/N2";
#define NEED_SCA_MSCI_INTR #define NEED_SCA_MSCI_INTR
#define MAX_TX_BUFFERS 10 #define MAX_TX_BUFFERS 10
static char *hw = NULL; /* pointer to hw=xxx command line string */ static char *hw; /* pointer to hw=xxx command line string */
/* RISCom/N2 Board Registers */ /* RISCom/N2 Board Registers */
...@@ -145,7 +145,6 @@ static card_t **new_card = &first_card; ...@@ -145,7 +145,6 @@ static card_t **new_card = &first_card;
&(card)->ports[port] : NULL) &(card)->ports[port] : NULL)
static __inline__ u8 sca_get_page(card_t *card) static __inline__ u8 sca_get_page(card_t *card)
{ {
return inb(card->io + N2_PSR) & PSR_PAGEBITS; return inb(card->io + N2_PSR) & PSR_PAGEBITS;
...@@ -159,11 +158,9 @@ static __inline__ void openwin(card_t *card, u8 page) ...@@ -159,11 +158,9 @@ static __inline__ void openwin(card_t *card, u8 page)
} }
#include "hd64570.c" #include "hd64570.c"
static void n2_set_iface(port_t *port) static void n2_set_iface(port_t *port)
{ {
card_t *card = port->card; card_t *card = port->card;
...@@ -478,7 +475,7 @@ static int __init n2_run(unsigned long io, unsigned long irq, ...@@ -478,7 +475,7 @@ static int __init n2_run(unsigned long io, unsigned long irq,
n2_destroy_card(card); n2_destroy_card(card);
return -ENOBUFS; return -ENOBUFS;
} }
sca_init_sync_port(port); /* Set up SCA memory */ sca_init_port(port); /* Set up SCA memory */
printk(KERN_INFO "%s: RISCom/N2 node %d\n", printk(KERN_INFO "%s: RISCom/N2 node %d\n",
dev->name, port->phy_node); dev->name, port->phy_node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment