Changeset f5b6fb5 in mainline

Timestamp:

2017-11-08T08:26:24Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d2e7a51

Parents:

6d15572

Message:

Fix mis-merge and revert accidentally committed changes.

Location:

uspace

Files:

• drv/char/ski-con/Makefile (modified) (1 diff)
• drv/platform/ski/Makefile (modified) (1 diff)
• srv/hid/input/port/chardev.c (modified) (2 diffs)

uspace/drv/char/ski-con/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
+LIBS = drv
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
 BINARY = ski-con

uspace/drv/platform/ski/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
+LIBS = drv
 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
 BINARY = ski

uspace/srv/hid/input/port/chardev.c

@@ -77 +77 @@
         
         for (i = 0; i < num_devs; i++) {
-                printf("%s: Probe service '%s'\n", NAME, in_devs[i]);
                 rc = loc_service_get_id(in_devs[i], &service_id, 0);
-                if (rc == EOK) {
-                        printf("%s: success \n", NAME);
+                if (rc == EOK)
                         break;
-                }
         }
         
@@ -115 +112 @@
                 return -1;
         }
-        printf("%s: Connected input device\n", NAME);
         
         return 0;