[U-Boot] [PATCH v2] usbtty: Added usbtty_configured() checks. Fixed attribute(packed) warnings.

Atin Malaviya atin.malaviya at gmail.com
Tue Feb 3 19:47:37 CET 2009


Added usb_configured() checks in usbtty_puts() and usbtty_putc() to  
get around a hang
when usb is not connected and the user has set up multi-io (setenv  
stdout serial,usbtty etc).
Got rid of redundant __attribute__((packed)) directives that were  
causing warnings from gcc.

Signed-off-by: Atin Malaviya <atin.malaviya at gmail.com>
---

This makes the previous v1 patch in http://lists.denx.de/pipermail/u-boot/2009-February/046705.html
obsolete. This patch is against the mainline u-boot next branch.

drivers/serial/usbtty.c |   18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index 7eba470..2624e6f 100644
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -150,8 +150,7 @@ struct acm_config_desc {

	/* Slave Interface */
	struct usb_interface_descriptor data_class_interface;
-	struct usb_endpoint_descriptor
-		data_endpoints[NUM_ENDPOINTS-1] __attribute__((packed));
+	struct usb_endpoint_descriptor data_endpoints[NUM_ENDPOINTS-1];
} __attribute__((packed));

static struct acm_config_desc  
acm_configuration_descriptors[NUM_CONFIGS] = {
@@ -280,10 +279,8 @@ static struct rs232_emu rs232_desc={
struct gserial_config_desc {

	struct usb_configuration_descriptor configuration_desc;
-	struct usb_interface_descriptor
-		interface_desc[NUM_GSERIAL_INTERFACES] __attribute__((packed));
-	struct usb_endpoint_descriptor
-		data_endpoints[NUM_ENDPOINTS] __attribute__((packed));
+	struct usb_interface_descriptor	 
interface_desc[NUM_GSERIAL_INTERFACES];
+	struct usb_endpoint_descriptor data_endpoints[NUM_ENDPOINTS];

} __attribute__((packed));

@@ -433,6 +430,9 @@ int usbtty_getc (void)
  */
void usbtty_putc (const char c)
{
+	if (!usbtty_configured ())
+		return;
+
	buf_push (&usbtty_output, &c, 1);
	/* If \n, also do \r */
	if (c == '\n')
@@ -486,8 +486,12 @@ static void __usbtty_puts (const char *str, int  
len)
void usbtty_puts (const char *str)
{
	int n;
-	int len = strlen (str);
+	int len;
+
+	if (!usbtty_configured ())
+		return;

+	len = strlen (str);
	/* add '\r' for each '\n' */
	while (len > 0) {
		n = next_nl_pos (str);
-- 
1.5.6.3




More information about the U-Boot mailing list