Changeset 2300b9d in mainline

Timestamp:

2010-04-30T08:29:42Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dafe675

Parents:

7f8b581

Message:

Fixed a bug.

Location:

uspace

Files:

• lib/libdrv/generic/driver.c (modified) (1 diff)
• srv/drivers/serial/serial.c (modified) (4 diffs)

uspace/lib/libdrv/generic/driver.c

@@ -81 +81 @@
 
 static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
-{
+{       
         int id = (int)IPC_GET_METHOD(*icall);
         interrupt_context_t *ctx = find_interrupt_context_by_id(&interrupt_contexts, id);
-        (*ctx->handler)(ctx->dev, iid, icall);  
+        if (NULL != ctx && NULL != ctx->handler) {
+                (*ctx->handler)(ctx->dev, iid, icall);          
+        }
 }
 

uspace/srv/drivers/serial/serial.c

@@ -242 +242 @@
         serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
         
+        int res;
         // enable interrupt globally    
-        enable_interrupt(data->irq);
+        printf(NAME ": call  enable_interrupt\n");
+        if (EOK != (res = interrupt_enable(data->irq))) {
+                return res;
+        }
         
         // enable interrupt on the serial port
         pio_write_8(data->port + 1 , 0x01);   // Interrupt when data received
-        pio_write_8(data->port + 4, 0x0B);
+        pio_write_8(data->port + 4, 0x0B);      
         
         return EOK;
@@ -267 +271 @@
 }
 
-static void serial_interrupt_handler(device_t *dev, ipc_callid_t iid, ipc_call_t *icall)
-{
-        // TODO 
+static void serial_read_from_device(device_t *dev)
+{
+        // TODO
+}
+
+static inline void serial_interrupt_handler(device_t *dev, ipc_callid_t iid, ipc_call_t *icall)
+{
+        printf(NAME ": interrupt received.\n");
+        serial_read_from_device(dev);
 }
 
@@ -276 +286 @@
         serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
         
-        return register_interrupt_handler(dev, data->irq, serial_interrupt_handler, NULL);
-        
+        return register_interrupt_handler(dev, data->irq, serial_interrupt_handler, NULL);      
+}
+
+static inline int serial_unregister_interrupt_handler(device_t *dev)
+{
+        serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
+        
+        return unregister_interrupt_handler(dev, data->irq);    
 }
 
@@ -304 +320 @@
         
         // register interrupt handler
-        if (0 != serial_register_interrupt_handler(dev)) {
-                
-        }
-        
-        // enable interrupt
-        if (0 != (res = serial_interrupt_enable(dev))) {
+        if (EOK != serial_register_interrupt_handler(dev)) {
+                printf(NAME ": failed to register interrupt handler.\n");
                 serial_dev_cleanup(dev);
                 return res;
+        }
+        
+        // enable interrupt
+        if (EOK != (res = serial_interrupt_enable(dev))) {
+                printf(NAME ": failed to enable the interrupt. Error code = %d.\n", res);
+                serial_dev_cleanup(dev);
+                serial_unregister_interrupt_handler(dev);
+                return res;
         }               
+        
+        printf(NAME ": the %s device has been successfully initialized.\n", dev->name);
         
         return EOK;