Changeset c7b5826 in mainline for uspace/app


Ignore:
Timestamp:
2011-05-18T09:34:56Z (15 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
33d19a7
Parents:
d736fe38 (diff), b2995c3 (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:

Development branch changes

Location:
uspace/app
Files:
1 added
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/app/lsusb/main.c

    rd736fe38 rc7b5826  
    4444#include <devman.h>
    4545#include <devmap.h>
    46 #include <usb/hub.h>
     46#include <usb/dev/hub.h>
    4747#include <usb/host.h>
    4848

  • uspace/app/mkbd/Makefile

    rd736fe38 rc7b5826  
    11#
    2 # Copyright (c) 2010-2011 Vojtech Horky
     2# Copyright (c) 2011 Vojtech Horky
    33# All rights reserved.
    44#
    … …  
    2828
    2929USPACE_PREFIX = ../..
     30BINARY = mkbd
    3031
    3132LIBS = \
    32         $(LIBUSBHID_PREFIX)/libusbhid.a \
    3333        $(LIBUSBDEV_PREFIX)/libusbdev.a \
    3434        $(LIBUSB_PREFIX)/libusb.a \
    3535        $(LIBDRV_PREFIX)/libdrv.a
    36 EXTRA_CFLAGS += \
    37         -I. \
     36EXTRA_CFLAGS = \
    3837        -I$(LIBUSB_PREFIX)/include \
    3938        -I$(LIBUSBDEV_PREFIX)/include \
    40         -I$(LIBUSBHID_PREFIX)/include \
    4139        -I$(LIBDRV_PREFIX)/include
    4240
    43 BINARY = usbkbd
    44 
    45 STOLEN_LAYOUT_SOURCES = \
    46         layout/us_qwerty.c \
    47         layout/us_dvorak.c \
    48         layout/cz.c
    49 
    5041SOURCES = \
    51         main.c \
    52         conv.c \
    53         kbddev.c \
    54         kbdrepeat.c \
    55         $(STOLEN_LAYOUT_SOURCES)
    56 
    57 EXTRA_CLEAN = $(STOLEN_LAYOUT_SOURCES)
    58 
    59 SRV_KBD = $(USPACE_PREFIX)/srv/hid/kbd
     42        main.c
    6043
    6144include $(USPACE_PREFIX)/Makefile.common
    62 
    63 layout/%.c: $(SRV_KBD)/layout/%.c
    64         ln -sfn ../$< $@

  • uspace/app/usbinfo/desctree.c

    rd736fe38 rc7b5826  
    4747
    4848#include "usbinfo.h"
    49 #include <usb/dp.h>
     49#include <usb/dev/dp.h>
    5050
    5151static void browse_descriptor_tree_internal(usb_dp_parser_t *parser,

  • uspace/app/usbinfo/dev.c

    rd736fe38 rc7b5826  
    3434 * Representation of queried device.
    3535 */
    36 #include <usb/pipes.h>
     36#include <usb/dev/pipes.h>
    3737#include <errno.h>
    3838#include <str_error.h>
    39 #include <usb/request.h>
     39#include <usb/dev/request.h>
    4040#include "usbinfo.h"
    4141

  • uspace/app/usbinfo/dump.c

    rd736fe38 rc7b5826  
    4747
    4848#include "usbinfo.h"
    49 #include <usb/dp.h>
     49#include <usb/dev/dp.h>
    5050
    5151#define INDENT "  "

  • uspace/app/usbinfo/info.c

    rd736fe38 rc7b5826  
    3737#include <str_error.h>
    3838#include <errno.h>
    39 #include <usb/pipes.h>
    40 #include <usb/recognise.h>
    41 #include <usb/request.h>
     39#include <usb/dev/pipes.h>
     40#include <usb/dev/recognise.h>
     41#include <usb/dev/request.h>
    4242#include <usb/classes/classes.h>
    4343#include <usb/classes/hub.h>

  • uspace/app/usbinfo/main.c

    rd736fe38 rc7b5826  
    4343#include <devman.h>
    4444#include <devmap.h>
    45 #include <usb/usbdevice.h>
    46 #include <usb/pipes.h>
     45#include <usb/dev/hc.h>
     46#include <usb/dev/pipes.h>
    4747#include <usb/host.h>
    4848#include <usb/driver.h>

  • uspace/app/usbinfo/usbinfo.h

    rd736fe38 rc7b5826  
    3838#include <usb/usb.h>
    3939#include <usb/descriptor.h>
    40 #include <usb/pipes.h>
     40#include <usb/dev/pipes.h>
    4141#include <usb/debug.h>
    42 #include <usb/dp.h>
     42#include <usb/dev/dp.h>
    4343#include <ipc/devman.h>
    4444

  • uspace/app/vuhid/hids/bootkbd.c

    rd736fe38 rc7b5826  
    3636#include <errno.h>
    3737#include <usb/debug.h>
    38 #include <usb/classes/hid.h>
    39 #include <usb/classes/hidut.h>
     38#include <usb/hid/hid.h>
     39#include <usb/hid/usages/core.h>
    4040
    4141#include "../report.h"

  • uspace/app/vuhid/main.c

    rd736fe38 rc7b5826  
    4545#include <usb/debug.h>
    4646#include <usb/classes/classes.h>
    47 #include <usb/classes/hid.h>
     47#include <usb/hid/hid.h>
    4848#include <usbvirt/device.h>
    4949
Note: See TracChangeset for help on using the changeset viewer.