Changeset 1b973dc in mainline for uspace/app


Ignore:
Timestamp:
2013-12-31T21:41:45Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1bb9833
Parents:
4c14b88 (diff), 8a84484 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge libdrv cleanup

Location:
uspace/app
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/mkbd/Makefile

    r4c14b88 r1b973dc  
    3434        $(LIBUSBDEV_PREFIX)/libusbdev.a \
    3535        $(LIBUSB_PREFIX)/libusb.a \
    36         $(LIBDRV_PREFIX)/libdrv.a
     36        $(LIBDRV_PREFIX)/libdrv.a
     37
    3738EXTRA_CFLAGS = \
    3839        -I$(LIBUSB_PREFIX)/include \

  • uspace/app/mkbd/main.c

    r4c14b88 r1b973dc  
    4444#include <devman.h>
    4545#include <loc.h>
    46 #include <usb/hid/iface.h>
     46#include <usbhid_iface.h>
    4747#include <usb/dev/pipes.h>
    4848#include <async.h>

  • uspace/app/sportdmp/Makefile

    r4c14b88 r1b973dc  
    2828
    2929USPACE_PREFIX = ../..
    30 #LIBS =
    31 #EXTRA_CFLAGS =
     30LIBS = $(LIBDRV_PREFIX)/libdrv.a
     31EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
    3232BINARY = sportdmp
    3333

  • uspace/app/sportdmp/sportdmp.c

    r4c14b88 r1b973dc  
    2727 */
    2828
    29 #include <device/char_dev.h>
     29#include <char_dev_iface.h>
    3030#include <errno.h>
    3131#include <ipc/serial_ctl.h>

  • uspace/app/tester/Makefile

    r4c14b88 r1b973dc  
    2929
    3030USPACE_PREFIX = ../..
    31 LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    32 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBSOFTFLOAT_PREFIX)
     31LIBS = \
     32        $(LIBBLOCK_PREFIX)/libblock.a \
     33        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
     34        $(LIBDRV_PREFIX)/libdrv.a
     35
     36EXTRA_CFLAGS = \
     37        -I$(LIBBLOCK_PREFIX) \
     38        -I$(LIBSOFTFLOAT_PREFIX) \
     39        -I$(LIBDRV_PREFIX)/include
     40
    3341BINARY = tester
    3442

  • uspace/app/tester/hw/misc/virtchar1.c

    r4c14b88 r1b973dc  
    4040#include <sys/types.h>
    4141#include <async.h>
    42 #include <device/char_dev.h>
     42#include <char_dev_iface.h>
    4343#include <str.h>
    4444#include <vfs/vfs.h>

  • uspace/app/tester/hw/serial/serial1.c

    r4c14b88 r1b973dc  
    4343#include <ipc/services.h>
    4444#include <loc.h>
    45 #include <device/char_dev.h>
     45#include <char_dev_iface.h>
    4646#include <str.h>
    4747#include <ipc/serial_ctl.h>
Note: See TracChangeset for help on using the changeset viewer.