usb: eth: Some style fixes.
Change-Id: If89e9702904271ab121de00dde0612fd40c48ef7
diff --git a/src/drivers/net/usb_eth.c b/src/drivers/net/usb_eth.c
index b37af15..813e053 100644
--- a/src/drivers/net/usb_eth.c
+++ b/src/drivers/net/usb_eth.c
@@ -30,7 +30,7 @@
#include "drivers/net/usb_eth.h"
int usb_eth_read_reg(UsbDev *dev, uint8_t request, uint16_t value,
- uint16_t index, uint16_t length, void *data)
+ uint16_t index, uint16_t length, void *data)
{
UsbDevReq dev_req;
dev_req.req_recp = UsbDevRecp;
@@ -47,7 +47,7 @@
}
int usb_eth_write_reg(UsbDev *dev, uint8_t request, uint16_t value,
- uint16_t index, uint16_t length, void *data)
+ uint16_t index, uint16_t length, void *data)
{
UsbDevReq dev_req;
dev_req.req_recp = UsbDevRecp;
@@ -64,7 +64,7 @@
}
int usb_eth_init_endpoints(UsbDev *dev, UsbEndpoint **in, int in_idx,
- UsbEndpoint **out, int out_idx)
+ UsbEndpoint **out, int out_idx)
{
*in = &dev->endpoints[in_idx];
*out = &dev->endpoints[out_idx];
@@ -81,26 +81,28 @@
ListNode usb_eth_drivers;
+
+
static NetDevice *usb_eth_net_device;
static int usb_eth_probe(GenericUsbDevice *dev)
{
- int i;
- UsbEthDevice *eth_dev;
+ UsbDeviceDescriptor *dd = dev->dev->descriptor;
- UsbDeviceDescriptor *dd = (UsbDeviceDescriptor *)dev->dev->descriptor;
+ UsbEthDevice *eth_dev;
list_for_each(eth_dev, usb_eth_drivers, list_node) {
- for (i = 0; i < eth_dev->num_supported_ids; i++) {
+ for (int i = 0; i < eth_dev->num_supported_ids; i++) {
if (dd->idVendor == eth_dev->supported_ids[i].vendor &&
dd->idProduct == eth_dev->supported_ids[i].product) {
+
usb_eth_net_device = ð_dev->net_dev;
usb_eth_net_device->dev_data = dev;
- if (eth_dev->init(dev)) {
+
+ if (eth_dev->init(dev))
break;
- } else {
- net_add_device(usb_eth_net_device);
- return 1;
- }
+
+ net_add_device(usb_eth_net_device);
+ return 1;
}
}
}
@@ -113,6 +115,13 @@
free(dev->dev_data);
}
+static GenericUsbDriver usb_eth_driver = {
+ .probe = &usb_eth_probe,
+ .remove = &usb_eth_remove,
+};
+
+
+
static void usb_net_poller(struct NetPoller *poller)
{
dc_usb_initialize();
@@ -123,10 +132,7 @@
.poll = usb_net_poller
};
-static GenericUsbDriver usb_eth_driver = {
- .probe = &usb_eth_probe,
- .remove = &usb_eth_remove,
-};
+
static int usb_eth_driver_register(void)
{
diff --git a/src/drivers/net/usb_eth.h b/src/drivers/net/usb_eth.h
index c2c8099..cb5bf26 100644
--- a/src/drivers/net/usb_eth.h
+++ b/src/drivers/net/usb_eth.h
@@ -29,7 +29,9 @@
typedef struct UsbEthDevice {
int (*init)(GenericUsbDevice *dev);
+
NetDevice net_dev;
+
const UsbEthId *supported_ids;
int num_supported_ids;