Changeset 92413de in mainline

Timestamp:

2010-02-25T21:56:24Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

c16cf62

Parents:

729fa2d6

Message:

fixed a bug (devman)

Location:

uspace

Files:

• lib/libc/generic/devman.c (modified) (1 diff)
• srv/devman/devman.c (modified) (1 diff)
• srv/devman/devman.h (modified) (3 diffs)
• srv/devman/main.c (modified) (2 diffs)

uspace/lib/libc/generic/devman.c

@@ -88 +88 @@
         aid_t req = async_send_2(phone, DEVMAN_DRIVER_REGISTER, 0, 0, &answer);
         
-        printf("devman_driver_register (\"%s\", conn)", name);
         ipcarg_t retval = async_data_write_start(phone, name, str_size(name));
         if (retval != EOK) {

uspace/srv/devman/devman.c

@@ -43 +43 @@
  */
 driver_t * create_driver() 
-{
-        printf(NAME ": create_driver\n");
-        
+{       
         driver_t *res = malloc(sizeof(driver_t));
         if(res != NULL) {

uspace/srv/devman/devman.h

@@ -199 +199 @@
 static inline void init_driver(driver_t *drv)
 {
-        printf(NAME ": init_driver\n");
         assert(drv != NULL);
 
@@ -210 +209 @@
 static inline void clean_driver(driver_t *drv)
 {
-        printf(NAME ": clean_driver\n");
         assert(drv != NULL);
 
@@ -223 +221 @@
 static inline void delete_driver(driver_t *drv)
 {
-        printf(NAME ": delete_driver\n");
         assert(NULL != drv);
         

uspace/srv/devman/main.c

@@ -101 +101 @@
         }
         
-        char drv_name[DEVMAN_NAME_MAXLEN];
+        char *drv_name = NULL;
         
         // Get driver name
-        int rc = async_string_receive(drv_name, DEVMAN_NAME_MAXLEN, NULL);      
+        int rc = async_string_receive(&drv_name, DEVMAN_NAME_MAXLEN, NULL);     
         if (rc != EOK) {
                 ipc_answer_0(iid, rc);
@@ -113 +113 @@
         // Find driver structure
         driver = find_driver(&drivers_list, drv_name);
+        
+        free(drv_name);
+        drv_name = NULL;
+        
         if (NULL == driver) {
                 printf(NAME ": no driver named %s was found.\n", drv_name);