Changeset 25a7e11d in mainline

Timestamp:

2010-04-30T14:13:41Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

f658458

Parents:

dafe675

Message:

backup (unstable)

Location:

uspace

Files:

• lib/libc/Makefile (modified) (1 diff)
• lib/libc/generic/device/char.c (added)
• lib/libc/include/device/char.h (added)
• lib/libc/include/ipc/dev_iface.h (modified) (1 diff)
• lib/libdrv/Makefile (modified) (1 diff)
• lib/libdrv/generic/dev_iface.c (modified) (1 diff)
• lib/libdrv/generic/driver.c (modified) (2 diffs)
• lib/libdrv/generic/remote_char.c (added)
• lib/libdrv/include/char.h (added)
• lib/libdrv/include/driver.h (modified) (2 diffs)
• lib/libdrv/include/remote_char.h (added)
• srv/drivers/serial/serial.c (modified) (2 diffs)

uspace/lib/libc/Makefile

@@ -55 +55 @@
         generic/devman.c \
         generic/device/hw_res.c \
+        generic/device/char.c \
         generic/event.c \
         generic/errno.c \

uspace/lib/libc/include/ipc/dev_iface.h

@@ -37 +37 @@
 typedef enum {  
         HW_RES_DEV_IFACE = 0,   
+        CHAR_DEV_IFACE,
         // TODO add more interfaces
         DEV_IFACE_MAX

uspace/lib/libdrv/Makefile

@@ -37 +37 @@
         generic/driver.c \
         generic/dev_iface.c \
-        generic/remote_res.h
+        generic/remote_res.c \
+        generic/remote_char.c
 
 include ../Makefile.common

uspace/lib/libdrv/generic/dev_iface.c

@@ -38 +38 @@
 #include "dev_iface.h"
 #include "remote_res.h"
+#include "remote_char.h"
  
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
-                &remote_res_iface
+                &remote_res_iface,
+                &remote_char_iface
         }
 };

uspace/lib/libdrv/generic/driver.c

@@ -224 +224 @@
         // TODO - if the client is not a driver, check whether it is allowed to use the device
 
-        // TODO open the device (introduce some callbacks for opening and closing devices registered by the driver)
-        
-        ipc_answer_0(iid, EOK); 
+        int ret = EOK;
+        // open the device
+        if (NULL != dev->class && NULL != dev->class->open) {
+                ret = (*dev->class->open)(dev);
+        }
+        
+        ipc_answer_0(iid, ret); 
 
         while (1) {
@@ -236 +240 @@
                 
                 switch  (method) {
-                case IPC_M_PHONE_HUNGUP:
-                
-                        // TODO close the device
-                        
+                case IPC_M_PHONE_HUNGUP:                
+                        // close the device
+                        if (NULL != dev->class && NULL != dev->class->close) {
+                                (*dev->class->close)(dev);
+                        }                       
                         ipc_answer_0(callid, EOK);
                         return;

uspace/lib/libdrv/include/driver.h

@@ -41 +41 @@
 #include <ipc/dev_iface.h>
 #include <device/hw_res.h>
+#include <device/char.h>
 #include <assert.h>
 #include <ddi.h>
@@ -81 +82 @@
         /** Unique identification of the class. */
         int id;
+        /** Optional callback function called when a client is connecting to the device. */
+        int (*open)(device_t *dev);
+        /** Optional callback function called when a client is disconnecting from the device. */
+        void (*close)(device_t *dev);
         /** The table of interfaces implemented by the device. */
         void *interfaces[DEV_IFACE_COUNT];      

uspace/srv/drivers/serial/serial.c

@@ -269 +269 @@
         int res;
         // enable interrupt globally    
-        printf(NAME ": call  enable_interrupt\n");
         if (EOK != (res = interrupt_enable(data->irq))) {
                 return res;
@@ -385 +384 @@
 }
 
+/** Open the device.
+ * 
+ * This is a callback function called when a client tries to connect to the device.
+ * 
+ * @param dev the device.
+ */
+static int serial_open(device_t *dev)
+{
+        serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
+        int res;
+        
+        fibril_mutex_lock(&data->mutex);        
+        
+        if (data->client_connected) {
+                res = ELIMIT;
+        } else {
+                res = EOK;
+                data->client_connected = true;
+        }
+        
+        fibril_mutex_unlock(&data->mutex);
+
+        return res;
+}
+
+/** Close the device.
+ * 
+ *  This is a callback function called when a client tries to disconnect from the device.
+ * 
+ * @param dev the device. 
+ */
+static void serial_close(device_t *dev)
+{
+        serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
+        
+        fibril_mutex_lock(&data->mutex);
+        
+        assert(data->client_connected); 
+        
+        data->client_connected = false;
+        buf_clear(&data->input_buffer);
+        
+        fibril_mutex_unlock(&data->mutex);       
+}
+
+/** Initialize the serial port driver.
+ * 
+ * Initialize class structures with callback methods for handling 
+ * client requests to the serial port devices.
+ */
 static void serial_init() 
 {
         // TODO
         serial_dev_class.id = 0;
+        serial_dev_class.open = &serial_open;
+        serial_dev_class.close = &serial_close; 
 }