Changeset ca97cad in mainline for uspace/srv/drivers/serial/serial.c

Timestamp:

2010-05-06T11:42:55Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

ab1aa871

Parents:

ba95e8f

Message:

writing to serial port using character interface

File:

• uspace/srv/drivers/serial/serial.c (modified) (5 diffs)

uspace/srv/drivers/serial/serial.c

@@ -92 +92 @@
 }
 
+static bool serial_received(ioport8_t *port) 
+{
+   return (pio_read_8(port + 5) & 1) != 0;
+}
+
+static uint8_t serial_read_8(ioport8_t *port) 
+{
+        return pio_read_8(port);
+}
+
+static bool is_transmit_empty(ioport8_t *port) 
+{
+   return (pio_read_8(port + 5) & 0x20) != 0;
+}
+
+static void serial_write_8(ioport8_t *port, uint8_t c) 
+{
+        while (!is_transmit_empty(port)) 
+                ;
+        
+        pio_write_8(port, c);
+}
+
 static int serial_read(device_t *dev, char *buf, size_t count) 
 {
@@ -111 +134 @@
 }
 
+static inline void serial_putchar(serial_dev_data_t *data, uint8_t c)
+{       
+        fibril_mutex_lock(&data->mutex);
+        serial_write_8(data->port, c);  
+        fibril_mutex_unlock(&data->mutex);
+}
+
 static int serial_write(device_t *dev, char *buf, size_t count) 
 {
-        // TODO
+        serial_dev_data_t *data = (serial_dev_data_t *)dev->driver_data;
+        
+        size_t idx;
+        for (idx = 0; idx < count; idx++) {
+                serial_putchar(data, (uint8_t)buf[idx]);
+        }
+        
         return 0;
 }
@@ -150 +186 @@
                 dev->parent_phone = 0;
         }       
-}
-
-static bool serial_received(ioport8_t *port) 
-{
-   return (pio_read_8(port + 5) & 1) != 0;
-}
-
-static uint8_t serial_read_8(ioport8_t *port) 
-{
-        return pio_read_8(port);
-}
-
-static bool is_transmit_empty(ioport8_t *port) 
-{
-   return (pio_read_8(port + 5) & 0x20) != 0;
-}
-
-static void serial_write_8(ioport8_t *port, uint8_t c) 
-{
-        while (!is_transmit_empty(port)) 
-                ;
-        
-        pio_write_8(port, c);
 }
 
@@ -333 +346 @@
         
         while (cont) {  
+                fibril_mutex_lock(&data->mutex);
+                
                 if (cont = serial_received(port)) {
                         uint8_t val = serial_read_8(port);
                         printf(NAME ": character %c read from %s.\n", val, dev->name);
                         
-                        fibril_mutex_lock(&data->mutex);
+                        
                         if (data->client_connected) {
                                 if (!buf_push_back(&(data->input_buffer), val)) {
@@ -346 +361 @@
                         } else {
                                 printf(NAME ": no client is connected to %s, discarding the character which was read.\n", dev->name);
-                        }
-                        fibril_mutex_unlock(&data->mutex);
+                        }                       
                 }
                 
+                fibril_mutex_unlock(&data->mutex);      
+                
+                fibril_yield();         
         }       
 }