Changes in / [75732da:37f7cfe] in mainline

Location:

uspace

Files:

• app/netstart/self_test.c (added)
• app/netstart/self_test.h (added)
• app/virtusbkbd/Makefile (modified) (1 diff)
• app/virtusbkbd/stdreq.c (modified) (1 diff)
• app/virtusbkbd/stdreq.h (modified) (1 diff)
• app/virtusbkbd/virtusbkbd.c (modified) (1 diff)
• drv/vhc/Makefile (modified) (1 diff)
• drv/vhc/hubops.c (modified) (1 diff)
• lib/packet/include/net_byteorder.h (deleted)
• lib/packet/include/net_err.h (deleted)
• lib/packet/include/socket_errno.h (deleted)
• lib/usbvirt/Makefile (modified) (1 diff)
• lib/usbvirt/callback.c (added)
• lib/usbvirt/ctrlpipe.c (added)
• lib/usbvirt/debug.c (added)
• lib/usbvirt/device.h (added)
• lib/usbvirt/hub.h (added)
• lib/usbvirt/include/usbvirt/device.h (deleted)
• lib/usbvirt/include/usbvirt/hub.h (deleted)
• lib/usbvirt/main.c (added)
• lib/usbvirt/private.h (added)
• lib/usbvirt/src/callback.c (deleted)
• lib/usbvirt/src/ctrlpipe.c (deleted)
• lib/usbvirt/src/debug.c (deleted)
• lib/usbvirt/src/main.c (deleted)
• lib/usbvirt/src/private.h (deleted)
• lib/usbvirt/src/stdreq.c (deleted)
• lib/usbvirt/src/transaction.c (deleted)
• lib/usbvirt/stdreq.c (added)
• lib/usbvirt/transaction.c (added)

uspace/app/virtusbkbd/Makefile

@@ -33 +33 @@
 
 LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBUSBVIRT_PREFIX)/include -I$(LIBDRV_PREFIX)/include
+EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIB_PREFIX) -I$(LIBDRV_PREFIX)/include
 
 SOURCES = \

uspace/app/virtusbkbd/stdreq.c

@@ -39 +39 @@
 #include "kbdconfig.h"
 
-int stdreq_on_get_descriptor(struct usbvirt_device *dev,
+static int on_get_descriptor(struct usbvirt_device *dev,
+    usb_device_request_setup_packet_t *request, uint8_t *data);
+
+usbvirt_standard_device_request_ops_t standard_request_ops = {
+        .on_get_status = NULL,
+        .on_clear_feature = NULL,
+        .on_set_feature = NULL,
+        .on_set_address = NULL,
+        .on_get_descriptor = on_get_descriptor,
+        .on_set_descriptor = NULL,
+        .on_get_configuration = NULL,
+        .on_set_configuration = NULL,
+        .on_get_interface = NULL,
+        .on_set_interface = NULL,
+        .on_synch_frame = NULL
+};
+
+
+static int on_get_descriptor(struct usbvirt_device *dev,
     usb_device_request_setup_packet_t *request, uint8_t *data)
 {

uspace/app/virtusbkbd/stdreq.h

@@ -38 +38 @@
 #include <usbvirt/device.h>
 
-int stdreq_on_get_descriptor(usbvirt_device_t *,
-    usb_device_request_setup_packet_t *, uint8_t *);
+extern usbvirt_standard_device_request_ops_t standard_request_ops;
 
 #endif

uspace/app/virtusbkbd/virtusbkbd.c

@@ -143 +143 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR]
-            = stdreq_on_get_descriptor,
+        .standard_request_ops = &standard_request_ops,
         .on_class_device_request = on_class_request,
         .on_data = on_incoming_data,

uspace/drv/vhc/Makefile

@@ -33 +33 @@
         $(LIBDRV_PREFIX)/libdrv.a
 EXTRA_CFLAGS += \
-        -I$(LIBUSBVIRT_PREFIX)/include \
+        -I$(LIB_PREFIX) \
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include

uspace/drv/vhc/hubops.c

@@ -70 +70 @@
 static void set_port_state_nl(hub_port_t *, hub_port_state_t);
 
+/** Standard USB requests. */
+static usbvirt_standard_device_request_ops_t standard_request_ops = {
+        .on_get_status = NULL,
+        .on_clear_feature = NULL,
+        .on_set_feature = NULL,
+        .on_set_address = NULL,
+        .on_get_descriptor = on_get_descriptor,
+        .on_set_descriptor = NULL,
+        .on_get_configuration = NULL,
+        .on_set_configuration = on_set_configuration,
+        .on_get_interface = NULL,
+        .on_set_interface = NULL,
+        .on_synch_frame = NULL
+};
+
 /** Hub operations. */
 usbvirt_device_ops_t hub_ops = {
-        .on_standard_request[USB_DEVREQ_GET_DESCRIPTOR] = on_get_descriptor,
-        .on_standard_request[USB_DEVREQ_SET_CONFIGURATION] = on_set_configuration,
+        .standard_request_ops = &standard_request_ops,
         .on_class_device_request = on_class_request,
         .on_data = NULL,

uspace/lib/usbvirt/Makefile

@@ -31 +31 @@
 
 LIBS = $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude
+EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include
 
 SOURCES = \
-        src/callback.c \
-        src/ctrlpipe.c \
-        src/debug.c \
-        src/main.c \
-        src/stdreq.c \
-        src/transaction.c
+        callback.c \
+        ctrlpipe.c \
+        debug.c \
+        main.c \
+        stdreq.c \
+        transaction.c
 
 include $(USPACE_PREFIX)/Makefile.common