leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added usbtty_configured() check. Fixed attribute(packed) warnings.

Browse Source 
V3: Fixed line-wrap problem due to user error in mail!

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@gmail.com>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
This commit is contained in:
Atin Malaviya 2009-02-03 15:17:10 -05:00 committed by Remy Bohmer
parent 6b67962fd6
commit f3c0de6362
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/serial/usbtty.c
View File

@ -150,8 +150,7 @@ struct acm_config_desc {
/* Slave Interface */ /* Slave Interface */
struct usb_interface_descriptor data_class_interface; struct usb_interface_descriptor data_class_interface;
struct usb_endpoint_descriptor struct usb_endpoint_descriptor data_endpoints[NUM_ENDPOINTS-1];
data_endpoints[NUM_ENDPOINTS-1] __attribute__((packed));
} __attribute__((packed)); } __attribute__((packed));
static struct acm_config_desc acm_configuration_descriptors[NUM_CONFIGS] = { 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 gserial_config_desc {
struct usb_configuration_descriptor configuration_desc; struct usb_configuration_descriptor configuration_desc;
struct usb_interface_descriptor struct usb_interface_descriptor interface_desc[NUM_GSERIAL_INTERFACES];
interface_desc[NUM_GSERIAL_INTERFACES] __attribute__((packed)); struct usb_endpoint_descriptor data_endpoints[NUM_ENDPOINTS];
struct usb_endpoint_descriptor
data_endpoints[NUM_ENDPOINTS] __attribute__((packed));
} __attribute__((packed)); } __attribute__((packed));
@ -433,6 +430,9 @@ int usbtty_getc (void)
*/ */
void usbtty_putc (const char c) void usbtty_putc (const char c)
{ {
if (!usbtty_configured ())
return;
buf_push (&usbtty_output, &c, 1); buf_push (&usbtty_output, &c, 1);
/* If \n, also do \r */ /* If \n, also do \r */
if (c == '\n') if (c == '\n')
@ -486,8 +486,12 @@ static void __usbtty_puts (const char *str, int len)
void usbtty_puts (const char *str) void usbtty_puts (const char *str)
{ {
int n; int n;
int len = strlen (str); int len;
if (!usbtty_configured ())
return;
len = strlen (str);
/* add '\r' for each '\n' */ /* add '\r' for each '\n' */
while (len > 0) { while (len > 0) {
n = next_nl_pos (str); n = next_nl_pos (str);