Changes in / [a09128c:4687fcd4] in mainline

Location:

uspace

Files:

• app/bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• app/bdsh/cmds/modules/rm/rm.c (modified) (1 diff)
• drv/rootvirt/devices.def (modified) (1 diff)
• drv/uhci/Makefile (modified) (1 diff)
• drv/uhci/callback.c (added)
• drv/uhci/callback.h (added)
• drv/uhci/debug.h (added)
• drv/uhci/iface.c (added)
• drv/uhci/iface.h (added)
• drv/uhci/main.c (modified) (5 diffs)
• drv/uhci/name.h (added)
• drv/uhci/root_hub/debug.h (added)
• drv/uhci/root_hub/port.c (added)
• drv/uhci/root_hub/port.h (added)
• drv/uhci/root_hub/port_status.c (added)
• drv/uhci/root_hub/port_status.h (added)
• drv/uhci/root_hub/root_hub.c (added)
• drv/uhci/root_hub/root_hub.h (added)
• drv/uhci/transfer_list.c (added)
• drv/uhci/transfer_list.h (added)
• drv/uhci/transfers.c (deleted)
• drv/uhci/uhci.c (added)
• drv/uhci/uhci.h (modified) (2 diffs)
• drv/uhci/uhci_struct/link_pointer.h (added)
• drv/uhci/uhci_struct/queue_head.h (added)
• drv/uhci/uhci_struct/transfer_descriptor.c (added)
• drv/uhci/uhci_struct/transfer_descriptor.h (added)
• drv/uhci/utils/malloc32.h (added)
• lib/usb/include/usb/addrkeep.h (added)
• lib/usb/include/usb/devreq.h (modified) (2 diffs)
• lib/usb/src/addrkeep.c (modified) (1 diff)

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

@@ -144 +144 @@
                         return CMD_SUCCESS;
                 case 'H':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 't':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 case 'b':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         break;
                 case 'm':
-                        printf(cat_oops);
+                        printf("%s", cat_oops);
                         return CMD_FAILURE;
                 }

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

@@ -227 +227 @@
                 }
                 memset(buff, 0, sizeof(buff));
-                snprintf(buff, len, argv[i]);
+                snprintf(buff, len, "%s", argv[i]);
 
                 scope = rm_scope(buff);

uspace/drv/rootvirt/devices.def

@@ -23 +23 @@
 #endif
 /* Virtual USB host controller. */
+/*
 {
         .name = "usbhc",
         .match_id = "usb&hc=vhc"
 },
+*/

uspace/drv/uhci/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBUSB_PREFIX)/include -I.
 BINARY = uhci
 
 SOURCES = \
+        callback.c \
+        iface.c \
         main.c \
-        pci.c \
-        transfers.c
+        root_hub/port.c \
+        root_hub/port_status.c \
+        root_hub/root_hub.c \
+        transfer_list.c \
+        uhci.c \
+        uhci_struct/transfer_descriptor.c \
+        pci.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/uhci/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2010 Vojtech Horky, Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <usb/hcdhubd.h>
-#include <usb_iface.h>
-#include <usb/debug.h>
+#include <driver.h>
 #include <errno.h>
 #include <str_error.h>
-#include <driver.h>
+#include <usb_iface.h>
+
+#include "debug.h"
+#include "iface.h"
+#include "name.h"
 #include "uhci.h"
 
@@ -54 +56 @@
 static int uhci_add_device(device_t *device)
 {
-        usb_dprintf(NAME, 1, "uhci_add_device() called\n");
+        uhci_print_info( "uhci_add_device() called\n" );
         device->ops = &uhci_ops;
 
@@ -65 +67 @@
 
         if (rc != EOK) {
-                fprintf(stderr,
-                    NAME ": failed to get I/O registers addresses: %s.\n",
+                uhci_print_fatal("failed to get I/O registers addresses: %s.\n",
                     str_error(rc));
                 return rc;
         }
 
-        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
+        uhci_print_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
 
-        /*
-         * We need to announce the presence of our root hub.
-         */
-        usb_dprintf(NAME, 2, "adding root hub\n");
-        usb_hcd_add_root_hub(device);
-
-        return EOK;
+        return uhci_init(device, (void*)io_reg_base, io_reg_size);
 }
 
@@ -98 +93 @@
          */
         sleep(5);
-        usb_dprintf_enable(NAME, 5);
+        usb_dprintf_enable(NAME, DEBUG_LEVEL_INFO);
 
         return driver_main(&uhci_driver);

uspace/drv/uhci/uhci.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2010 Jan Vesely
  * All rights reserved.
  *
@@ -36 +36 @@
 #define DRV_UHCI_UHCI_H
 
+#include <fibril.h>
+
+#include <usb/addrkeep.h>
 #include <usbhc_iface.h>
 
-#define NAME "uhci"
+#include "root_hub/root_hub.h"
+#include "transfer_list.h"
 
-usbhc_iface_t uhci_iface;
+typedef struct uhci_regs {
+        uint16_t usbcmd;
+#define UHCI_CMD_MAX_PACKET (1 << 7)
+#define UHCI_CMD_CONFIGURE  (1 << 6)
+#define UHCI_CMD_DEBUG  (1 << 5)
+#define UHCI_CMD_FORCE_GLOBAL_RESUME  (1 << 4)
+#define UHCI_CMD_FORCE_GLOBAL_SUSPEND  (1 << 3)
+#define UHCI_CMD_GLOBAL_RESET  (1 << 2)
+#define UHCI_CMD_HCRESET  (1 << 1)
+#define UHCI_CMD_RUN_STOP  (1 << 0)
+
+        uint16_t usbsts;
+#define UHCI_STATUS_HALTED (1 << 5)
+#define UHCI_STATUS_PROCESS_ERROR (1 << 4)
+#define UHCI_STATUS_SYSTEM_ERROR (1 << 3)
+#define UHCI_STATUS_RESUME (1 << 2)
+#define UHCI_STATUS_ERROR_INTERRUPT (1 << 1)
+#define UHCI_STATUS_INTERRUPT (1 << 0)
+
+        uint16_t usbintr;
+        uint16_t frnum;
+        uint32_t flbaseadd;
+        uint8_t sofmod;
+} regs_t;
+
+#define TRANSFER_QUEUES 4
+#define UHCI_FRAME_LIST_COUNT 1024
+#define UHCI_CLEANER_TIMEOUT 1000000
+#define UHCI_DEBUGER_TIMEOUT 500000
+
+typedef struct uhci {
+        usb_address_keeping_t address_manager;
+        uhci_root_hub_t root_hub;
+        volatile regs_t *registers;
+
+        link_pointer_t *frame_list;
+
+        transfer_list_t transfers[TRANSFER_QUEUES];
+        fid_t cleaner;
+        fid_t debug_checker;
+} uhci_t;
+
+/* init uhci specifics in device.driver_data */
+int uhci_init( device_t *device, void *regs, size_t reg_size );
+
+int uhci_destroy( device_t *device );
+
+int uhci_transfer(
+  device_t *dev,
+  usb_target_t target,
+  usb_transfer_type_t transfer_type,
+        bool toggle,
+  usb_packet_id pid,
+  void *buffer, size_t size,
+  usbhc_iface_transfer_out_callback_t callback_out,
+  usbhc_iface_transfer_in_callback_t callback_in,
+  void *arg );
 
 int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);

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

@@ -70 +70 @@
         /** Main parameter to the request. */
         union {
+                uint16_t value;
                 /* FIXME: add #ifdefs according to host endianess */
                 struct {
@@ -75 +76 @@
                         uint8_t value_high;
                 };
-                uint16_t value;
         };
         /** Auxiliary parameter to the request.

uspace/lib/usb/src/addrkeep.c

@@ -33 +33 @@
  * @brief Address keeping.
  */
-#include <usb/hcd.h>
+#include <usb/addrkeep.h>
 #include <errno.h>
 #include <assert.h>