WAN: Convert Zilog-based drivers to generic HDLC

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

1 files changed, 154 insertions, 228 deletions

diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index f3065d3473fd..e299313f828a 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -16,6 +16,8 @@
  *      touching control registers.
  *
  *      Port B isnt wired (why - beats me)
+ *
+ *      Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
  */
 
 #include <linux/module.h>
@@ -26,6 +28,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/delay.h>
+#include <linux/hdlc.h>
 #include <linux/ioport.h>
 #include <net/arp.h>
 
@@ -33,34 +36,31 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>
-#include <net/syncppp.h>
 #include "z85230.h"
 
 static int dma;
 
-struct sv11_device
-{
-        void *if_ptr;   /* General purpose pointer (used by SPPP) */
-        struct z8530_dev sync;
-        struct ppp_device netdev;
-};
-
 /*
  *      Network driver support routines
  */
 
+static inline struct z8530_dev* dev_to_sv(struct net_device *dev)
+{
+        return (struct z8530_dev *)dev_to_hdlc(dev)->priv;
+}
+
 /*
- *      Frame receive. Simple for our card as we do sync ppp and there
+ *      Frame receive. Simple for our card as we do HDLC and there
  *      is no funny garbage involved
  */
- 
+
 static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)
 {
         /* Drop the CRC - it's not a good idea to try and negotiate it ;) */
-        skb_trim(skb, skb->len-2);
-        skb->protocol=__constant_htons(ETH_P_WAN_PPP);
+        skb_trim(skb, skb->len - 2);
+        skb->protocol = hdlc_type_trans(skb, c->netdevice);
         skb_reset_mac_header(skb);
-        skb->dev=c->netdevice;
+        skb->dev = c->netdevice;
         /*
          *      Send it to the PPP layer. We don't have time to process
          *      it right now.
@@ -68,56 +68,51 @@ static void hostess_input(struct z8530_channel *c, struct sk_buff *skb)
         netif_rx(skb);
         c->netdevice->last_rx = jiffies;
 }
- 
+
 /*
  *      We've been placed in the UP state
- */ 
- 
+ */
+
 static int hostess_open(struct net_device *d)
 {
-        struct sv11_device *sv11=d->ml_priv;
+        struct z8530_dev *sv11 = dev_to_sv(d);
         int err = -1;
-        
+
         /*
          *      Link layer up
          */
-        switch(dma)
-        {
+        switch (dma) {
                 case 0:
-                        err=z8530_sync_open(d, &sv11->sync.chanA);
+                        err = z8530_sync_open(d, &sv11->chanA);
                         break;
                 case 1:
-                        err=z8530_sync_dma_open(d, &sv11->sync.chanA);
+                        err = z8530_sync_dma_open(d, &sv11->chanA);
                         break;
                 case 2:
-                        err=z8530_sync_txdma_open(d, &sv11->sync.chanA);
+                        err = z8530_sync_txdma_open(d, &sv11->chanA);
                         break;
         }
-        
-        if(err)
+
+        if (err)
                 return err;
-        /*
-         *      Begin PPP
-         */
-        err=sppp_open(d);
-        if(err)
-        {
-                switch(dma)
-                {
+
+        err = hdlc_open(d);
+        if (err) {
+                switch (dma) {
                         case 0:
-                                z8530_sync_close(d, &sv11->sync.chanA);
+                                z8530_sync_close(d, &sv11->chanA);
                                 break;
                         case 1:
-                                z8530_sync_dma_close(d, &sv11->sync.chanA);
+                                z8530_sync_dma_close(d, &sv11->chanA);
                                 break;
                         case 2:
-                                z8530_sync_txdma_close(d, &sv11->sync.chanA);
+                                z8530_sync_txdma_close(d, &sv11->chanA);
                                 break;
-                }                               
+                }
                 return err;
         }
-        sv11->sync.chanA.rx_function=hostess_input;
-        
+        sv11->chanA.rx_function = hostess_input;
+
         /*
          *      Go go go
          */
@@ -128,30 +123,24 @@ static int hostess_open(struct net_device *d)
 
 static int hostess_close(struct net_device *d)
 {
-        struct sv11_device *sv11=d->ml_priv;
+        struct z8530_dev *sv11 = dev_to_sv(d);
         /*
          *      Discard new frames
          */
-        sv11->sync.chanA.rx_function=z8530_null_rx;
-        /*
-         *      PPP off
-         */
-        sppp_close(d);
-        /*
-         *      Link layer down
-         */
+        sv11->chanA.rx_function = z8530_null_rx;
+
+        hdlc_close(d);
         netif_stop_queue(d);
-                
-        switch(dma)
-        {
+
+        switch (dma) {
                 case 0:
-                        z8530_sync_close(d, &sv11->sync.chanA);
+                        z8530_sync_close(d, &sv11->chanA);
                         break;
                 case 1:
-                        z8530_sync_dma_close(d, &sv11->sync.chanA);
+                        z8530_sync_dma_close(d, &sv11->chanA);
                         break;
                 case 2:
-                        z8530_sync_txdma_close(d, &sv11->sync.chanA);
+                        z8530_sync_txdma_close(d, &sv11->chanA);
                         break;
         }
         return 0;
@@ -159,232 +148,174 @@ static int hostess_close(struct net_device *d)
 
 static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
 {
-        /* struct sv11_device *sv11=d->ml_priv;
-           z8530_ioctl(d,&sv11->sync.chanA,ifr,cmd) */
-        return sppp_do_ioctl(d, ifr,cmd);
-}
-
-static struct net_device_stats *hostess_get_stats(struct net_device *d)
-{
-        struct sv11_device *sv11=d->ml_priv;
-        if(sv11)
-                return z8530_get_stats(&sv11->sync.chanA);
-        else
-                return NULL;
+        /* struct z8530_dev *sv11=dev_to_sv(d);
+           z8530_ioctl(d,&sv11->chanA,ifr,cmd) */
+        return hdlc_ioctl(d, ifr, cmd);
 }
 
 /*
- *      Passed PPP frames, fire them downwind.
+ *      Passed network frames, fire them downwind.
  */
- 
+
 static int hostess_queue_xmit(struct sk_buff *skb, struct net_device *d)
 {
-        struct sv11_device *sv11=d->ml_priv;
-        return z8530_queue_xmit(&sv11->sync.chanA, skb);
+        return z8530_queue_xmit(&dev_to_sv(d)->chanA, skb);
 }
 
-static int hostess_neigh_setup(struct neighbour *n)
+static int hostess_attach(struct net_device *dev, unsigned short encoding,
+                          unsigned short parity)
 {
-        if (n->nud_state == NUD_NONE) {
-                n->ops = &arp_broken_ops;
-                n->output = n->ops->output;
-        }
-        return 0;
-}
-
-static int hostess_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
-{
-        if (p->tbl->family == AF_INET) {
-                p->neigh_setup = hostess_neigh_setup;
-                p->ucast_probes = 0;
-                p->mcast_probes = 0;
-        }
-        return 0;
-}
-
-static void sv11_setup(struct net_device *dev)
-{       
-        dev->open = hostess_open;
-        dev->stop = hostess_close;
-        dev->hard_start_xmit = hostess_queue_xmit;
-        dev->get_stats = hostess_get_stats;
-        dev->do_ioctl = hostess_ioctl;
-        dev->neigh_setup = hostess_neigh_setup_dev;
+        if (encoding == ENCODING_NRZ && parity == PARITY_CRC16_PR1_CCITT)
+                return 0;
+        return -EINVAL;
 }
 
 /*
  *      Description block for a Comtrol Hostess SV11 card
  */
- 
-static struct sv11_device *sv11_init(int iobase, int irq)
+
+static struct z8530_dev *sv11_init(int iobase, int irq)
 {
-        struct z8530_dev *dev;
-        struct sv11_device *sv;
-        
+        struct z8530_dev *sv;
+        struct net_device *netdev;
         /*
          *      Get the needed I/O space
          */
-         
-        if(!request_region(iobase, 8, "Comtrol SV11"))
-        {       
-                printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n", iobase);
+
+        if (!request_region(iobase, 8, "Comtrol SV11")) {
+                printk(KERN_WARNING "hostess: I/O 0x%X already in use.\n",
+                       iobase);
                 return NULL;
         }
-        
-        sv = kzalloc(sizeof(struct sv11_device), GFP_KERNEL);
-        if(!sv)
-                goto fail3;
-                        
-        sv->if_ptr=&sv->netdev;
-        
-        sv->netdev.dev = alloc_netdev(0, "hdlc%d", sv11_setup);
-        if(!sv->netdev.dev)
-                goto fail2;
-
-        dev=&sv->sync;
-        
+
+        sv = kzalloc(sizeof(struct z8530_dev), GFP_KERNEL);
+        if (!sv)
+                goto err_kzalloc;
+
         /*
          *      Stuff in the I/O addressing
          */
-         
-        dev->active = 0;
-        
-        dev->chanA.ctrlio=iobase+1;
-        dev->chanA.dataio=iobase+3;
-        dev->chanB.ctrlio=-1;
-        dev->chanB.dataio=-1;
-        dev->chanA.irqs=&z8530_nop;
-        dev->chanB.irqs=&z8530_nop;
-        
-        outb(0, iobase+4);              /* DMA off */
-        
+
+        sv->active = 0;
+
+        sv->chanA.ctrlio = iobase + 1;
+        sv->chanA.dataio = iobase + 3;
+        sv->chanB.ctrlio = -1;
+        sv->chanB.dataio = -1;
+        sv->chanA.irqs = &z8530_nop;
+        sv->chanB.irqs = &z8530_nop;
+
+        outb(0, iobase + 4);            /* DMA off */
+
         /* We want a fast IRQ for this device. Actually we'd like an even faster
            IRQ ;) - This is one driver RtLinux is made for */
-           
-        if(request_irq(irq, &z8530_interrupt, IRQF_DISABLED, "Hostess SV11", dev)<0)
-        {
+
+        if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED,
+                        "Hostess SV11", sv) < 0) {
                 printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
-                goto fail1;
+                goto err_irq;
         }
-        
-        dev->irq=irq;
-        dev->chanA.private=sv;
-        dev->chanA.netdevice=sv->netdev.dev;
-        dev->chanA.dev=dev;
-        dev->chanB.dev=dev;
-        
-        if(dma)
-        {
+
+        sv->irq = irq;
+        sv->chanA.private = sv;
+        sv->chanA.dev = sv;
+        sv->chanB.dev = sv;
+
+        if (dma) {
                 /*
                  *      You can have DMA off or 1 and 3 thats the lot
                  *      on the Comtrol.
                  */
-                dev->chanA.txdma=3;
-                dev->chanA.rxdma=1;
-                outb(0x03|0x08, iobase+4);              /* DMA on */
-                if(request_dma(dev->chanA.txdma, "Hostess SV/11 (TX)")!=0)
-                        goto fail;
-                        
-                if(dma==1)
-                {
-                        if(request_dma(dev->chanA.rxdma, "Hostess SV/11 (RX)")!=0)
-                                goto dmafail;
-                }
+                sv->chanA.txdma = 3;
+                sv->chanA.rxdma = 1;
+                outb(0x03 | 0x08, iobase + 4);          /* DMA on */
+                if (request_dma(sv->chanA.txdma, "Hostess SV/11 (TX)"))
+                        goto err_txdma;
+
+                if (dma == 1)
+                        if (request_dma(sv->chanA.rxdma, "Hostess SV/11 (RX)"))
+                                goto err_rxdma;
         }
 
         /* Kill our private IRQ line the hostess can end up chattering
            until the configuration is set */
         disable_irq(irq);
-                
+
         /*
          *      Begin normal initialise
          */
-         
-        if(z8530_init(dev)!=0)
-        {
+
+        if (z8530_init(sv)) {
                 printk(KERN_ERR "Z8530 series device not found.\n");
                 enable_irq(irq);
-                goto dmafail2;
+                goto free_dma;
         }
-        z8530_channel_load(&dev->chanB, z8530_dead_port);
-        if(dev->type==Z85C30)
-                z8530_channel_load(&dev->chanA, z8530_hdlc_kilostream);
+        z8530_channel_load(&sv->chanB, z8530_dead_port);
+        if (sv->type == Z85C30)
+                z8530_channel_load(&sv->chanA, z8530_hdlc_kilostream);
         else
-                z8530_channel_load(&dev->chanA, z8530_hdlc_kilostream_85230);
-        
+                z8530_channel_load(&sv->chanA, z8530_hdlc_kilostream_85230);
+
         enable_irq(irq);
-        
 
         /*
          *      Now we can take the IRQ
          */
-        if(dev_alloc_name(dev->chanA.netdevice,"hdlc%d")>=0)
-        {
-                struct net_device *d=dev->chanA.netdevice;
 
-                /* 
-                 *      Initialise the PPP components
-                 */
-                d->ml_priv = sv;
-                sppp_attach(&sv->netdev);
-                
-                /*
-                 *      Local fields
-                 */     
-                
-                d->base_addr = iobase;
-                d->irq = irq;
-                
-                if(register_netdev(d))
-                {
-                        printk(KERN_ERR "%s: unable to register device.\n",
-                                d->name);
-                        sppp_detach(d);
-                        goto dmafail2;
-                }
+        sv->chanA.netdevice = netdev = alloc_hdlcdev(sv);
+        if (!netdev)
+                goto free_dma;
 
-                z8530_describe(dev, "I/O", iobase);
-                dev->active=1;
-                return sv;      
+        dev_to_hdlc(netdev)->attach = hostess_attach;
+        dev_to_hdlc(netdev)->xmit = hostess_queue_xmit;
+        netdev->open = hostess_open;
+        netdev->stop = hostess_close;
+        netdev->do_ioctl = hostess_ioctl;
+        netdev->base_addr = iobase;
+        netdev->irq = irq;
+
+        if (register_hdlc_device(netdev)) {
+                printk(KERN_ERR "hostess: unable to register HDLC device.\n");
+                free_netdev(netdev);
+                goto free_dma;
         }
-dmafail2:
-        if(dma==1)
-                free_dma(dev->chanA.rxdma);
-dmafail:
-        if(dma)
-                free_dma(dev->chanA.txdma);
-fail:
-        free_irq(irq, dev);
-fail1:
-        free_netdev(sv->netdev.dev);
-fail2:
+
+        z8530_describe(sv, "I/O", iobase);
+        sv->active = 1;
+        return sv;
+
+free_dma:
+        if (dma == 1)
+                free_dma(sv->chanA.rxdma);
+err_rxdma:
+        if (dma)
+                free_dma(sv->chanA.txdma);
+err_txdma:
+        free_irq(irq, sv);
+err_irq:
         kfree(sv);
-fail3:
-        release_region(iobase,8);
+err_kzalloc:
+        release_region(iobase, 8);
         return NULL;
 }
 
-static void sv11_shutdown(struct sv11_device *dev)
+static void sv11_shutdown(struct z8530_dev *dev)
 {
-        sppp_detach(dev->netdev.dev);
-        unregister_netdev(dev->netdev.dev);
-        z8530_shutdown(&dev->sync);
-        free_irq(dev->sync.irq, dev);
-        if(dma)
-        {
-                if(dma==1)
-                        free_dma(dev->sync.chanA.rxdma);
-                free_dma(dev->sync.chanA.txdma);
+        unregister_hdlc_device(dev->chanA.netdevice);
+        z8530_shutdown(dev);
+        free_irq(dev->irq, dev);
+        if (dma) {
+                if (dma == 1)
+                        free_dma(dev->chanA.rxdma);
+                free_dma(dev->chanA.txdma);
         }
-        release_region(dev->sync.chanA.ctrlio-1, 8);
-        free_netdev(dev->netdev.dev);
+        release_region(dev->chanA.ctrlio - 1, 8);
+        free_netdev(dev->chanA.netdevice);
         kfree(dev);
 }
 
-#ifdef MODULE
-
-static int io=0x200;
-static int irq=9;
+static int io = 0x200;
+static int irq = 9;
 
 module_param(io, int, 0);
 MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");
@@ -397,22 +328,17 @@ MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Modular driver for the Comtrol Hostess SV11");
 
-static struct sv11_device *sv11_unit;
+static struct z8530_dev *sv11_unit;
 
 int init_module(void)
 {
-        printk(KERN_INFO "SV-11 Z85230 Synchronous Driver v 0.03.\n");
-        printk(KERN_INFO "(c) Copyright 2001, Red Hat Inc.\n"); 
-        if((sv11_unit=sv11_init(io,irq))==NULL)
+        if ((sv11_unit = sv11_init(io, irq)) == NULL)
                 return -ENODEV;
         return 0;
 }
 
 void cleanup_module(void)
 {
-        if(sv11_unit)
+        if (sv11_unit)
                 sv11_shutdown(sv11_unit);
 }
-
-#endif
-