Changes in / [7fc092a:6265a2b] in mainline


Ignore:
Location:
uspace
Files:
1 added
20 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/cmds/modules/cat/cat.c

    r7fc092a r6265a2b  
    144144                        return CMD_SUCCESS;
    145145                case 'H':
    146                         printf("%s", cat_oops);
     146                        printf(cat_oops);
    147147                        return CMD_FAILURE;
    148148                case 't':
    149                         printf("%s", cat_oops);
     149                        printf(cat_oops);
    150150                        return CMD_FAILURE;
    151151                case 'b':
    152                         printf("%s", cat_oops);
     152                        printf(cat_oops);
    153153                        break;
    154154                case 'm':
    155                         printf("%s", cat_oops);
     155                        printf(cat_oops);
    156156                        return CMD_FAILURE;
    157157                }

  • uspace/app/bdsh/cmds/modules/rm/rm.c

    r7fc092a r6265a2b  
    227227                }
    228228                memset(buff, 0, sizeof(buff));
    229                 snprintf(buff, len, "%s", argv[i]);
     229                snprintf(buff, len, argv[i]);
    230230
    231231                scope = rm_scope(buff);

  • uspace/drv/rootvirt/devices.def

    r7fc092a r6265a2b  
    2323#endif
    2424/* Virtual USB host controller. */
    25 /*
    2625{
    2726        .name = "usbhc",
    2827        .match_id = "usb&hc=vhc"
    2928},
    30 */

  • uspace/drv/uhci/Makefile

    r7fc092a r6265a2b  
    2929USPACE_PREFIX = ../..
    3030LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
    31 EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
     31EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include
    3232BINARY = uhci
    3333
    3434SOURCES = \
    35         callback.c \
    36         iface.c \
    3735        main.c \
    38         root_hub/port.c \
    39         root_hub/port_status.c \
    40         root_hub/root_hub.c \
    41         transfer_list.c \
    42         uhci.c
     36        transfers.c
    4337
    4438include $(USPACE_PREFIX)/Makefile.common

  • uspace/drv/uhci/main.c

    r7fc092a r6265a2b  
    11/*
    2  * Copyright (c) 2010 Vojtech Horky, Jan Vesely
     2 * Copyright (c) 2010 Vojtech Horky
    33 * All rights reserved.
    44 *
    … …  
    2828#include <usb/hcdhubd.h>
    2929#include <usb_iface.h>
     30#include <usb/debug.h>
    3031#include <errno.h>
    31 
    32 #include "debug.h"
    33 #include "iface.h"
    34 #include "name.h"
     32#include <driver.h>
    3533#include "uhci.h"
    3634
    … …  
    5553static int uhci_add_device(device_t *device)
    5654{
    57         uhci_print_info( "uhci_add_device() called\n" );
     55        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
    5856        device->ops = &uhci_ops;
    5957
    60         // TODO: get this value out of pci driver
    61         uhci_init(device, (void*)0xc020);
     58        /*
     59         * We need to announce the presence of our root hub.
     60         */
     61        usb_dprintf(NAME, 2, "adding root hub\n");
     62        usb_hcd_add_root_hub(device);
    6263
    6364        return EOK;
    … …  
    7980         */
    8081        sleep(5);
    81         usb_dprintf_enable(NAME, DEBUG_LEVEL_MAX);
     82        usb_dprintf_enable(NAME, 5);
    8283
    8384        return driver_main(&uhci_driver);

  • uspace/drv/uhci/uhci.h

    r7fc092a r6265a2b  
    11/*
    2  * Copyright (c) 2010 Jan Vesely
     2 * Copyright (c) 2010 Vojtech Horky
    33 * All rights reserved.
    44 *
    … …  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
     28
    2829/** @addtogroup usb
    2930 * @{
    … …  
    3536#define DRV_UHCI_UHCI_H
    3637
    37 #include <fibril.h>
    38 
    39 #include <usb/addrkeep.h>
    40 #include <usb/hcdhubd.h>
    4138#include <usbhc_iface.h>
    4239
    43 #include "root_hub/root_hub.h"
    44 #include "transfer_list.h"
     40#define NAME "uhci"
    4541
    46 typedef struct uhci_regs {
    47         uint16_t usbcmd;
    48         uint16_t usbsts;
    49         uint16_t usbintr;
    50         uint16_t frnum;
    51         uint32_t flbaseadd;
    52         uint8_t sofmod;
    53 } regs_t;
    54 
    55 #define TRANSFER_QUEUES 4
    56 #define UHCI_FRAME_LIST_COUNT 1024
    57 
    58 typedef struct uhci {
    59         usb_address_keeping_t address_manager;
    60         uhci_root_hub_t root_hub;
    61         volatile regs_t *registers;
    62 
    63         link_pointer_t *frame_list;
    64 
    65         transfer_list_t transfers[TRANSFER_QUEUES];
    66         fid_t cleaner;
    67 } uhci_t;
    68 
    69 /* init uhci specifics in device.driver_data */
    70 int uhci_init( device_t *device, void *regs );
    71 
    72 int uhci_destroy( device_t *device );
    73 
    74 int uhci_in(
    75   device_t *dev,
    76         usb_target_t target,
    77         usb_transfer_type_t transfer_type,
    78         void *buffer, size_t size,
    79         usbhc_iface_transfer_in_callback_t callback, void *arg
    80         );
    81 
    82 int uhci_out(
    83   device_t *dev,
    84         usb_target_t target,
    85   usb_transfer_type_t transfer_type,
    86   void *buffer, size_t size,
    87         usbhc_iface_transfer_out_callback_t callback, void *arg
    88   );
    89 
    90 int uhci_setup(
    91   device_t *dev,
    92   usb_target_t target,
    93   usb_transfer_type_t transfer_type,
    94   void *buffer, size_t size,
    95   usbhc_iface_transfer_out_callback_t callback, void *arg
    96   );
     42usbhc_iface_t uhci_iface;
    9743
    9844#endif

  • uspace/lib/usb/include/usb/devreq.h

    r7fc092a r6265a2b  
    7070        /** Main parameter to the request. */
    7171        union {
    72                 uint16_t value;
    7372                /* FIXME: add #ifdefs according to host endianess */
    7473                struct {
    … …  
    7675                        uint8_t value_high;
    7776                };
     77                uint16_t value;
    7878        };
    7979        /** Auxiliary parameter to the request.

  • uspace/lib/usb/src/addrkeep.c

    r7fc092a r6265a2b  
    3333 * @brief Address keeping.
    3434 */
    35 #include <usb/addrkeep.h>
     35#include <usb/hcd.h>
    3636#include <errno.h>
    3737#include <assert.h>
Note: See TracChangeset for help on using the changeset viewer.