. add checks to printer driver kernel calls

 . correct some i/o locations for printer in drivers.conf

diff --git a/drivers/printer/Makefile b/drivers/printer/Makefile
index e216724ec6ab2ea01d30a585180b4a92cd879fd2..243bd0dec95d023c1884318ab7033ee5ad35cf66 100644 (file)
--- a/drivers/printer/Makefile
+++ b/drivers/printer/Makefile
@@ -21,7 +21,7 @@ OBJ = printer.o
 all build:     $(DRIVER)
 $(DRIVER):     $(OBJ)
        $(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS)
-       install -S 8k $(DRIVER)
+       install $(DRIVER)
 
 # install with other drivers
 install:       /usr/sbin/$(DRIVER)

diff --git a/drivers/printer/printer.c b/drivers/printer/printer.c
index 61ab831fb1f9d36eb859181aacddc02ca9286044..88ed7c16a8e0c9ff2a441da4242fc316d226cf54 100644 (file)
--- a/drivers/printer/printer.c
+++ b/drivers/printer/printer.c
@@ -208,13 +208,16 @@ int safe;                 /* use virtual addresses or grant id's? */
 
         retries = MAX_ONLINE_RETRIES + 1;  
         while (--retries > 0) {
-            sys_inb(port_base + 1, &status);
+            if(sys_inb(port_base + 1, &status) != OK) {
+               printf("printer: sys_inb of %x failed\n", port_base+1);
+               panic(__FILE__,"sys_inb failed", NO_NUM);
+           }
             if ((status & ON_LINE)) {          /* printer online! */
                prepare_output();
                do_printer_output();
                return;
             }
-            tickdelay(30);             /* wait before retry */
+            tickdelay(HZ/2);           /* wait before retry */
         }
         /* If we reach this point, the printer was not online in time. */
         done_status = status;
@@ -331,16 +334,24 @@ PRIVATE void do_initialize()
   initialized = TRUE;
   
   /* Get the base port for first printer.  */
-  sys_vircopy(SELF, BIOS_SEG, LPT1_IO_PORT_ADDR, 
-       SELF, D, (vir_bytes) &port_base, LPT1_IO_PORT_SIZE);
-  sys_outb(port_base + 2, INIT_PRINTER);
-  tickdelay(1);                        /* easily satisfies Centronics minimum */
-                               /* was 2 millisecs; now is ~17 millisecs */
-  sys_outb(port_base + 2, PR_SELECT);
+  if(sys_vircopy(SELF, BIOS_SEG, LPT1_IO_PORT_ADDR, 
+       SELF, D, (vir_bytes) &port_base, LPT1_IO_PORT_SIZE) != OK) {
+       panic(__FILE__, "do_initialize: sys_vircopy failed", NO_NUM);
+  }
+  if(sys_outb(port_base + 2, INIT_PRINTER) != OK) {
+       printf("printer: sys_outb of %x failed\n", port_base+2);
+       panic(__FILE__, "do_initialize: sys_outb init failed", NO_NUM);
+  }
+  tickdelay(HZ/20);            /* easily satisfies Centronics minimum */
+  if(sys_outb(port_base + 2, PR_SELECT) != OK) {
+       printf("printer: sys_outb of %x failed\n", port_base+2);
+       panic(__FILE__, "do_initialize: sys_outb select failed", NO_NUM);
+  }
   irq_hook_id = 0;
-  sys_irqsetpolicy(PRINTER_IRQ, 0, &irq_hook_id);
-  sys_irqenable(&irq_hook_id);
-
+  if(sys_irqsetpolicy(PRINTER_IRQ, 0, &irq_hook_id) != OK ||
+     sys_irqenable(&irq_hook_id) != OK) {
+       panic(__FILE__, "do_initialize: irq enabling failed", NO_NUM);
+  }
 }
 
 /*==========================================================================*
@@ -389,8 +400,13 @@ PRIVATE void do_printer_output()
         * when the printer is busy with a previous character, because the
         * interrupt status does not affect the printer.
         */
-       sys_outb(port_base + 2, PR_SELECT);
-       sys_irqenable(&irq_hook_id);
+       if(sys_outb(port_base + 2, PR_SELECT) != OK) {
+               printf("printer: sys_outb of %x failed\n", port_base+2);
+               panic(__FILE__,"sys_outb failed", NO_NUM);
+       }
+       if(sys_irqenable(&irq_hook_id) != OK) {
+               panic(__FILE__,"sys_irqenable failed", NO_NUM);
+       }
        return;
   }
 
@@ -398,7 +414,10 @@ PRIVATE void do_printer_output()
        /* Loop to handle fast (buffered) printers.  It is important that
         * processor interrupts are not disabled here, just printer interrupts.
         */
-       (void) sys_inb(port_base + 1, &status);
+       if(sys_inb(port_base + 1, &status) != OK) {
+               printf("printer: sys_inb of %x failed\n", port_base+1);
+               panic(__FILE__,"sys_inb failed", NO_NUM);
+       }
        if ((status & STATUS_MASK) == BUSY_STATUS) {
                /* Still busy with last output.  This normally happens
                 * immediately after doing output to an unbuffered or slow
@@ -406,7 +425,9 @@ PRIVATE void do_printer_output()
                 * pr_restart, since they are not synchronized with printer
                 * interrupts.  It may happen after a spurious interrupt.
                 */
-               sys_irqenable(&irq_hook_id);
+               if(sys_irqenable(&irq_hook_id) != OK) {
+                       panic(__FILE__, "sys_irqenable failed\n", NO_NUM);
+               }
                return;
        }
        if ((status & STATUS_MASK) == NORMAL_STATUS) {
@@ -414,7 +435,10 @@ PRIVATE void do_printer_output()
                pv_set(char_out[0], port_base, *optr++);        
                pv_set(char_out[1], port_base+2, ASSERT_STROBE);
                pv_set(char_out[2], port_base+2, NEGATE_STROBE);
-               sys_voutb(char_out, 3); /* request series of port outb */
+               if(sys_voutb(char_out, 3) != OK) {
+                       /* request series of port outb */
+                       panic(__FILE__, "sys_voutb failed\n", NO_NUM);
+               }
 
                user_vir_d++;
                user_left--;
@@ -422,7 +446,9 @@ PRIVATE void do_printer_output()
                /* Error.  This would be better ignored (treat as busy). */
                done_status = status;
                output_done();
-               sys_irqenable(&irq_hook_id);
+               if(sys_irqenable(&irq_hook_id) != OK) {
+                       panic(__FILE__, "sys_irqenable failed\n", NO_NUM);
+               }
                return;
        }
   }
@@ -431,6 +457,8 @@ PRIVATE void do_printer_output()
   /* Finished printing chunk OK. */
   done_status = OK;
   output_done();
-  sys_irqenable(&irq_hook_id);
+  if(sys_irqenable(&irq_hook_id) != OK) {
+       panic(__FILE__, "sys_irqenable failed\n", NO_NUM);
+  }
 }
 

diff --git a/etc/drivers.conf b/etc/drivers.conf
index 21511aeac3b57296d4e3ef3ef7d16ed3f3427db4..957b251a3953d0a5ddd240115f28bd0cd3299288 100644 (file)
--- a/etc/drivers.conf
+++ b/etc/drivers.conf
@@ -187,10 +187,8 @@ driver mfs
 
 driver printer
 {
-       io      408:2           # LPT1
-               40a:2           # LPT2
-               40c:2           # LPT3
-               40e:2           # LPT4
+       io      378:4           # LPT1
+               278:4           # LPT2
        ;
        irq
                7               # PRINTER_IRQ