Take debug printout macros back from linux-2.6.27 and make them more
useful and more compatible.
Signed-off-by: Vitaly Kuzmichev <vkuzmic...@mvista.com>
---
drivers/usb/gadget/ether.c | 65 +++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index a07738f..b6f5f4d 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -37,8 +37,10 @@
#define dev_err(x, stuff...) printf(stuff)
#define dev_dbg dev_err
#define dev_warn dev_err
-#define DEBUG dev_err
-#define VDEBUG DEBUG
+#define WARN INFO
+#define ERROR INFO
+#define DEBUG INFO
+#define VDEBUG dprintf
#define atomic_read
extern struct platform_data brd;
#define spin_lock(x)
@@ -769,7 +771,7 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)
result = usb_ep_enable (dev->status_ep, dev->status);
if (result != 0) {
- printf ("enable %s --> %d\n",
+ DEBUG (dev, "enable %s --> %d\n",
dev->status_ep->name, result);
goto done;
}
@@ -789,14 +791,14 @@ set_ether_config (struct eth_dev *dev, gfp_t gfp_flags)
if (!cdc_active(dev)) {
result = usb_ep_enable (dev->in_ep, dev->in);
if (result != 0) {
- printf ("enable %s --> %d\n",
+ DEBUG(dev, "enable %s --> %d\n",
dev->in_ep->name, result);
goto done;
}
result = usb_ep_enable (dev->out_ep, dev->out);
if (result != 0) {
- printf ("enable %s --> %d\n",
+ DEBUG (dev, "enable %s --> %d\n",
dev->out_ep->name, result);
goto done;
}
@@ -827,6 +829,8 @@ static void eth_reset_config (struct eth_dev *dev)
if (dev->config == 0)
return;
+ DEBUG (dev, "%s\n", __func__);
+
/* disable endpoints, forcing (synchronous) completion of
* pending i/o. then free the requests.
*/
@@ -941,17 +945,17 @@ static void eth_status_complete (struct usb_ep *ep,
struct usb_request *req)
req->length = STATUS_BYTECOUNT;
value = usb_ep_queue (ep, req, GFP_ATOMIC);
- dprintf ("send SPEED_CHANGE --> %d\n", value);
+ DEBUG (dev, "send SPEED_CHANGE --> %d\n", value);
if (value == 0)
return;
} else if (value != -ECONNRESET) {
- dprintf("event %02x --> %d\n",
+ DEBUG (dev, "event %02x --> %d\n",
event->bNotificationType, value);
if (event->bNotificationType==
USB_CDC_NOTIFY_SPEED_CHANGE)
{
l_ethdev.network_started=1;
- printf("USB network up!\n");
+ INFO(&l_ethdev, "USB network up!\n");
}
}
req->context = NULL;
@@ -991,7 +995,7 @@ static void issue_start_status (struct eth_dev *dev)
value = usb_ep_queue (dev->status_ep, req, GFP_ATOMIC);
if (value < 0)
- printf ("status buf queue --> %d\n", value);
+ DEBUG (dev, "status buf queue --> %d\n", value);
}
#endif
@@ -1001,7 +1005,7 @@ static void issue_start_status (struct eth_dev *dev)
static void eth_setup_complete (struct usb_ep *ep, struct usb_request *req)
{
if (req->status || req->actual != req->length)
- dprintf (/*(struct eth_dev *) ep->driver_data*/
+ DEBUG ((struct eth_dev *) ep->driver_data,
"setup complete --> %d, %d/%d\n",
req->status, req->actual, req->length);
}
@@ -1029,7 +1033,7 @@ eth_setup (struct usb_gadget *gadget, const struct
usb_ctrlrequest *ctrl)
* while config change events may enable network traffic.
*/
- dprintf("eth_setup:...\n");
+ VDEBUG(dev, "%s\n", __func__);
req->complete = eth_setup_complete;
switch (ctrl->bRequest) {
@@ -1179,7 +1183,7 @@ done_set_intf:
|| wLength != 0
|| wIndex > 1)
break;
- printf ("packet filter %02x\n", wValue);
+ DEBUG (dev, "packet filter %02x\n", wValue);
dev->cdc_filter = wValue;
value = 0;
break;
@@ -1194,7 +1198,7 @@ done_set_intf:
#endif /* DEV_CONFIG_CDC */
default:
- printf (
+ VDEBUG (dev,
"unknown control req%02x.%02x v%04x i%04x l%d\n",
ctrl->bRequestType, ctrl->bRequest,
wValue, wIndex, wLength);
@@ -1202,7 +1206,7 @@ done_set_intf:
/* respond with data transfer before status phase? */
if (value >= 0) {
- dprintf("respond with data transfer before status phase\n");
+ DEBUG(dev, "respond with data transfer before status phase\n");
req->length = value;
req->zero = value < wLength
&& (value % gadget->ep0->maxpacket) == 0;
@@ -1237,7 +1241,7 @@ static int rx_submit ( struct eth_dev *dev, struct
usb_request *req, \
* byte off the end (to force hardware errors on overflow).
*/
- dprintf("%s\n", __func__);
+ VDEBUG(dev, "%s\n", __func__);
size = (ETHER_HDR_SIZE + dev->mtu + RX_EXTRA);
size += dev->out_ep->maxpacket - 1;
@@ -1255,7 +1259,7 @@ static int rx_submit ( struct eth_dev *dev, struct
usb_request *req, \
retval = usb_ep_queue (dev->out_ep, req, gfp_flags);
if (retval) {
- dprintf ("rx submit --> %d\n", retval);
+ DEBUG (dev, "rx submit --> %d\n", retval);
}
return retval;
}
@@ -1265,8 +1269,7 @@ static void rx_complete (struct usb_ep *ep, struct
usb_request *req)
{
struct eth_dev *dev = ep->driver_data;
- dprintf("%s\n", __func__);
- dprintf("rx status %d\n", req->status);
+ VDEBUG(dev, "%s: status %d\n", __func__, req->status);
packet_received=1;
@@ -1298,7 +1301,7 @@ fail:
static void tx_complete (struct usb_ep *ep, struct usb_request *req)
{
- dprintf("%s, status: %s\n", __func__,(req->status) ? "failed":"ok");
+ VDEBUG(ep->driver_data, "%s: status %s\n", __func__,
(req->status)?"failed":"ok");
packet_sent=1;
}
@@ -1427,7 +1430,7 @@ static void eth_unbind (struct usb_gadget *gadget)
{
struct eth_dev *dev = get_gadget_data (gadget);
- printf("eth_unbind:...\n");
+ DEBUG (dev, "%s...\n", __func__);
if (dev->stat_req) {
usb_ep_free_request (dev->status_ep, dev->stat_req);
@@ -1768,7 +1771,7 @@ static int usb_eth_init(struct eth_device* netdev, bd_t*
bd)
unsigned long timeout = USB_CONNECT_TIMEOUT;
if (!netdev) {
- printf("ERROR: received NULL ptr\n");
+ ERROR(dev, "ERROR: received NULL ptr\n");
goto fail;
}
@@ -1790,7 +1793,7 @@ static int usb_eth_init(struct eth_device* netdev, bd_t*
bd)
{
/* Handle control-c and timeouts */
if (ctrlc() || (get_timer(ts) > timeout)) {
- printf("The remote end did not respond in time.\n");
+ ERROR(dev, "The remote end did not respond in time.\n");
goto fail;
}
usb_gadget_handle_interrupts();
@@ -1806,9 +1809,9 @@ static int usb_eth_send(struct eth_device* netdev,
volatile void* packet, int le
{
int retval;
struct usb_request *req = NULL;
+ struct eth_dev *dev = &l_ethdev;
- struct eth_dev *dev = &l_ethdev;
- dprintf("%s:...\n",__func__);
+ VDEBUG(dev, "%s:...\n", __func__);
req = dev->tx_req;
@@ -1836,7 +1839,7 @@ static int usb_eth_send(struct eth_device* netdev,
volatile void* packet, int le
retval = usb_ep_queue (dev->in_ep, req, GFP_ATOMIC);
if (!retval)
- dprintf("%s: packet queued\n",__func__);
+ VDEBUG(dev, "%s: packet queued\n",__func__);
while(!packet_sent)
{
packet_sent=0;
@@ -1853,7 +1856,7 @@ static int usb_eth_recv(struct eth_device* netdev)
if (packet_received)
{
- dprintf("%s: packet received \n",__func__);
+ VDEBUG(dev, "%s: packet received \n",__func__);
if (dev->rx_req)
{
NetReceive(NetRxPackets[0],dev->rx_req->length);
@@ -1862,7 +1865,7 @@ static int usb_eth_recv(struct eth_device* netdev)
if (dev->rx_req)
rx_submit (dev, dev->rx_req, 0);
}
- else printf("dev->rx_req invalid\n");
+ else WARN(dev, "dev->rx_req invalid\n");
}
return 0;
}
@@ -1873,7 +1876,7 @@ void usb_eth_halt(struct eth_device* netdev)
if (!netdev)
{
- printf("ERROR: received NULL ptr\n");
+ ERROR(dev, "ERROR: received NULL ptr\n");
return;
}
@@ -1929,11 +1932,11 @@ int usb_eth_initialize(bd_t *bi)
host_addr[sizeof(host_addr)-1] = '\0';
if (!is_eth_addr_valid(dev_addr)) {
- printf("ERROR: Need valid 'usbnet_devaddr' to be set\n");
+ ERROR(dev, "ERROR: Need valid 'usbnet_devaddr' to be set\n");
status = -1;
}
if (!is_eth_addr_valid(host_addr)) {
- printf("ERROR: Need valid 'usbnet_hostaddr' to be set\n");
+ ERROR(dev, "ERROR: Need valid 'usbnet_hostaddr' to be set\n");
status = -1;
}
if (status)
@@ -1947,7 +1950,7 @@ int usb_eth_initialize(bd_t *bi)
return 0;
fail:
- printf("%s failed\n", __func__ );
+ ERROR(dev, "%s failed. error = %d\n", __func__, status);
return status;
}
--
1.7.1.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
