Changeset f619943a in mainline

Timestamp:

2010-05-12T14:36:49Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

04c7003f

Parents:

f4ef3c2

Message:

set baud rate from test_serial application; fixed a bug

Location:

uspace

Files:

• app/test_serial/test_serial.c (modified) (3 diffs)
• lib/libc/include/ipc/dev_iface.h (modified) (1 diff)
• srv/drivers/serial/serial.c (modified) (6 diffs)

uspace/app/test_serial/test_serial.c

@@ -46 +46 @@
 #include <device/char.h>
 #include <string.h>
+#include <ipc/serial_ctl.h>
 
 #define NAME            "test serial"
@@ -91 +92 @@
         }
         
+        res = ipc_call_sync_1_0(phone, SERIAL_SET_BAUD_RATE, 1200);
+        if (EOK != res) {
+                printf(NAME ": failed to set baud rate, errno = %d.\n", -res);
+                devman_hangup_phone(DEVMAN_CLIENT);
+                ipc_hangup(phone);
+                free(buf);
+                return 4;               
+        }
+        
         int total = 0;
         int read = 0;
@@ -100 +110 @@
                         devman_hangup_phone(DEVMAN_CLIENT);
                         free(buf);
-                        return 4;
+                        return 5;
                 }               
                 total += read;

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

@@ -45 +45 @@
 #define DEV_IFACE_IDX(id) ((id) - IPC_FIRST_USER_METHOD)
 
-#define DEV_IFACE_COUNT DEV_IFACE_MAX
-#define DEV_FIRST_CUSTOM_METHOD DEV_IFACE_MAX
+#define DEV_IFACE_COUNT                                 DEV_IFACE_MAX
+#define DEV_FIRST_CUSTOM_METHOD_IDX     DEV_IFACE_MAX
+#define DEV_FIRST_CUSTOM_METHOD                 DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX)
 
 

uspace/srv/drivers/serial/serial.c

@@ -119 +119 @@
 static int serial_read(device_t *dev, char *buf, size_t count) 
 {
-        printf(NAME ": serial_read %s\n", dev->name);
+        // printf(NAME ": serial_read %s\n", dev->name);
         
         int ret = 0;
@@ -342 +342 @@
         
         if (50 > baud_rate || 0 != MAX_BAUD_RATE % baud_rate) {
+                printf(NAME ": error - somebody tried to set invalid baud rate %d\n", baud_rate);
                 return EINVAL; 
         }
@@ -364 +365 @@
         ioport8_t *port = data->port;
         int ret;
+        
+        printf(NAME ": set baud rate %d for the device %s.\n", baud_rate, dev->name);
         
         fibril_mutex_lock(&data->mutex);        
@@ -380 +383 @@
         
         serial_port_interrupts_disable(port);     // Disable all interrupts
-        serial_port_set_baud_rate(port, 1200);
+        serial_port_set_baud_rate(port, 38400);
         pio_write_8(port + 3, 0x07);    // 8 bits, no parity, two stop bits
         pio_write_8(port + 2, 0xC7);    // Enable FIFO, clear them, with 14-byte threshold
@@ -398 +401 @@
                 if (cont = serial_received(port)) {
                         uint8_t val = serial_read_8(port);
-                        printf(NAME ": character %c read from %s.\n", val, dev->name);
-                        
+                        // printf(NAME ": character %c read from %s.\n", val, dev->name);                       
                         
                         if (data->client_connected) {
@@ -408 +410 @@
                                 }
                         } else {
-                                printf(NAME ": no client is connected to %s, discarding the character which was read.\n", dev->name);
+                                // printf(NAME ": no client is connected to %s, discarding the character which was read.\n", dev->name);
                         }                       
                 }