serial: Tidy REMOTE_DEBUG

REMOTE_DEBUG does already appear in 2.2 kernel sources but didn't
appear as a config Option in the initial git import 2.6.12-rc. It's
currently just used in one single place of the linux kernel and should
probably be dropped totally

Signed-off-by: Christoph Egger <siccegge@cs.fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 78a62eb..ecbe479 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -176,23 +176,6 @@ static void config_setup(struct cyclades_port *);
 static void show_status(int);
 #endif
 
-#ifdef CONFIG_REMOTE_DEBUG
-static void debug_setup(void);
-void queueDebugChar(int c);
-int getDebugChar(void);
-
-#define DEBUG_PORT     1
-#define DEBUG_LEN      256
-
-typedef struct {
-       int in;
-       int out;
-       unsigned char buf[DEBUG_LEN];
-} debugq;
-
-debugq debugiq;
-#endif
-
 /*
  * I have my own version of udelay(), as it is needed when initialising
  * the chip, before the delay loop has been calibrated.  Should probably
@@ -515,11 +498,6 @@ static irqreturn_t cd2401_tx_interrupt(int irq, void *dev_id)
        /* determine the channel and change to that context */
        channel = (u_short) (base_addr[CyLICR] >> 2);
 
-#ifdef CONFIG_REMOTE_DEBUG
-       if (channel == DEBUG_PORT) {
-               panic("TxInt on debug port!!!");
-       }
-#endif
        /* validate the port number (as configured and open) */
        if ((channel < 0) || (NR_PORTS <= channel)) {
                base_addr[CyIER] &= ~(CyTxMpty | CyTxRdy);
@@ -634,14 +612,6 @@ static irqreturn_t cd2401_rx_interrupt(int irq, void *dev_id)
        info->last_active = jiffies;
        save_cnt = char_count = base_addr[CyRFOC];
 
-#ifdef CONFIG_REMOTE_DEBUG
-       if (channel == DEBUG_PORT) {
-               while (char_count--) {
-                       data = base_addr[CyRDR];
-                       queueDebugChar(data);
-               }
-       } else
-#endif
                /* if there is nowhere to put the data, discard it */
        if (info->tty == 0) {
                while (char_count--) {
@@ -2195,9 +2165,7 @@ static int __init serial167_init(void)
                port_num++;
                info++;
        }
-#ifdef CONFIG_REMOTE_DEBUG
-       debug_setup();
-#endif
+
        ret = request_irq(MVME167_IRQ_SER_ERR, cd2401_rxerr_interrupt, 0,
                          "cd2401_errors", cd2401_rxerr_interrupt);
        if (ret) {
@@ -2518,193 +2486,4 @@ static int __init serial167_console_init(void)
 
 console_initcall(serial167_console_init);
 
-#ifdef CONFIG_REMOTE_DEBUG
-void putDebugChar(int c)
-{
-       volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-       unsigned long flags;
-       volatile u_char sink;
-       u_char ier;
-       int port;
-
-       local_irq_save(flags);
-
-       /* Ensure transmitter is enabled! */
-
-       port = DEBUG_PORT;
-       base_addr[CyCAR] = (u_char) port;
-       while (base_addr[CyCCR])
-               ;
-       base_addr[CyCCR] = CyENB_XMTR;
-
-       ier = base_addr[CyIER];
-       base_addr[CyIER] = CyTxMpty;
-
-       while (1) {
-               if (pcc2chip[PccSCCTICR] & 0x20) {
-                       /* We have a Tx int. Acknowledge it */
-                       sink = pcc2chip[PccTPIACKR];
-                       if ((base_addr[CyLICR] >> 2) == port) {
-                               base_addr[CyTDR] = c;
-                               base_addr[CyTEOIR] = 0;
-                               break;
-                       } else
-                               base_addr[CyTEOIR] = CyNOTRANS;
-               }
-       }
-
-       base_addr[CyIER] = ier;
-
-       local_irq_restore(flags);
-}
-
-int getDebugChar()
-{
-       volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-       unsigned long flags;
-       volatile u_char sink;
-       u_char ier;
-       int port;
-       int i, c;
-
-       i = debugiq.out;
-       if (i != debugiq.in) {
-               c = debugiq.buf[i];
-               if (++i == DEBUG_LEN)
-                       i = 0;
-               debugiq.out = i;
-               return c;
-       }
-       /* OK, nothing in queue, wait in poll loop */
-
-       local_irq_save(flags);
-
-       /* Ensure receiver is enabled! */
-
-       port = DEBUG_PORT;
-       base_addr[CyCAR] = (u_char) port;
-#if 0
-       while (base_addr[CyCCR])
-               ;
-       base_addr[CyCCR] = CyENB_RCVR;
-#endif
-       ier = base_addr[CyIER];
-       base_addr[CyIER] = CyRxData;
-
-       while (1) {
-               if (pcc2chip[PccSCCRICR] & 0x20) {
-                       /* We have a Rx int. Acknowledge it */
-                       sink = pcc2chip[PccRPIACKR];
-                       if ((base_addr[CyLICR] >> 2) == port) {
-                               int cnt = base_addr[CyRFOC];
-                               while (cnt-- > 0) {
-                                       c = base_addr[CyRDR];
-                                       if (c == 0)
-                                               printk
-                                                   ("!! debug char is null (cnt=%d) !!",
-                                                    cnt);
-                                       else
-                                               queueDebugChar(c);
-                               }
-                               base_addr[CyREOIR] = 0;
-                               i = debugiq.out;
-                               if (i == debugiq.in)
-                                       panic("Debug input queue empty!");
-                               c = debugiq.buf[i];
-                               if (++i == DEBUG_LEN)
-                                       i = 0;
-                               debugiq.out = i;
-                               break;
-                       } else
-                               base_addr[CyREOIR] = CyNOTRANS;
-               }
-       }
-
-       base_addr[CyIER] = ier;
-
-       local_irq_restore(flags);
-
-       return (c);
-}
-
-void queueDebugChar(int c)
-{
-       int i;
-
-       i = debugiq.in;
-       debugiq.buf[i] = c;
-       if (++i == DEBUG_LEN)
-               i = 0;
-       if (i != debugiq.out)
-               debugiq.in = i;
-}
-
-static void debug_setup()
-{
-       unsigned long flags;
-       volatile unsigned char *base_addr = (u_char *) BASE_ADDR;
-       int i, cflag;
-
-       cflag = B19200;
-
-       local_irq_save(flags);
-
-       for (i = 0; i < 4; i++) {
-               base_addr[CyCAR] = i;
-               base_addr[CyLICR] = i << 2;
-       }
-
-       debugiq.in = debugiq.out = 0;
-
-       base_addr[CyCAR] = DEBUG_PORT;
-
-       /* baud rate */
-       i = cflag & CBAUD;
-
-       base_addr[CyIER] = 0;
-
-       base_addr[CyCMR] = CyASYNC;
-       base_addr[CyLICR] = DEBUG_PORT << 2;
-       base_addr[CyLIVR] = 0x5c;
-
-       /* tx and rx baud rate */
-
-       base_addr[CyTCOR] = baud_co[i];
-       base_addr[CyTBPR] = baud_bpr[i];
-       base_addr[CyRCOR] = baud_co[i] >> 5;
-       base_addr[CyRBPR] = baud_bpr[i];
-
-       /* set line characteristics  according configuration */
-
-       base_addr[CySCHR1] = 0;
-       base_addr[CySCHR2] = 0;
-       base_addr[CySCRL] = 0;
-       base_addr[CySCRH] = 0;
-       base_addr[CyCOR1] = Cy_8_BITS | CyPARITY_NONE;
-       base_addr[CyCOR2] = 0;
-       base_addr[CyCOR3] = Cy_1_STOP;
-       base_addr[CyCOR4] = baud_cor4[i];
-       base_addr[CyCOR5] = 0;
-       base_addr[CyCOR6] = 0;
-       base_addr[CyCOR7] = 0;
-
-       write_cy_cmd(base_addr, CyINIT_CHAN);
-       write_cy_cmd(base_addr, CyENB_RCVR);
-
-       base_addr[CyCAR] = DEBUG_PORT;  /* !!! Is this needed? */
-
-       base_addr[CyRTPRL] = 2;
-       base_addr[CyRTPRH] = 0;
-
-       base_addr[CyMSVR1] = CyRTS;
-       base_addr[CyMSVR2] = CyDTR;
-
-       base_addr[CyIER] = CyRxData;
-
-       local_irq_restore(flags);
-
-}                              /* debug_setup */
-
-#endif
-
 MODULE_LICENSE("GPL");