Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset f5b6fb5 in mainline


Ignore:
Timestamp:
2017-11-08T08:26:24Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
d2e7a51
Parents:
6d15572
Message:

Fix mis-merge and revert accidentally committed changes.

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/char/ski-con/Makefile

    r6d15572 rf5b6fb5  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30LIBS = drv
    3131EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
    3232BINARY = ski-con
  • uspace/drv/platform/ski/Makefile

    r6d15572 rf5b6fb5  
    2828
    2929USPACE_PREFIX = ../../..
    30 LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30LIBS = drv
    3131EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
    3232BINARY = ski
  • uspace/srv/hid/input/port/chardev.c

    r6d15572 rf5b6fb5  
    7777       
    7878        for (i = 0; i < num_devs; i++) {
    79                 printf("%s: Probe service '%s'\n", NAME, in_devs[i]);
    8079                rc = loc_service_get_id(in_devs[i], &service_id, 0);
    81                 if (rc == EOK) {
    82                         printf("%s: success \n", NAME);
     80                if (rc == EOK)
    8381                        break;
    84                 }
    8582        }
    8683       
     
    115112                return -1;
    116113        }
    117         printf("%s: Connected input device\n", NAME);
    118114       
    119115        return 0;
Note: See TracChangeset for help on using the changeset viewer.