Re: [RFC: linux-2.6.16-rc1 patch] jsm: fix for high baud ratesproblem

[Andrew Morton]

"V. Ananda Krishnan" <mansarov@xxxxxxxxxx> wrote:
>
> igi serial port console doesn't work when baud rates are set higher 
> than 38400.  So the lookup table and code in jsm_neo.c has been modified 
> and tested.

- All the code you've added is one tabstop too far to the right.

- We can simplify the definition of baud_rates[]

- Using local variable `baud' as a temporary cflag is confusing.

- The baud_rates[] scanning can be simplified.

- local `i' doesn't need the initialiser.



How's this look?

--- 25/drivers/serial/jsm/jsm_neo.c~jsm-fix-for-high-baud-rates-problem-tidy	Tue Jan 31 15:57:46 2006
+++ 25-akpm/drivers/serial/jsm/jsm_neo.c	Tue Jan 31 15:57:46 2006
@@ -965,50 +965,47 @@ static void neo_param(struct jsm_channel
 			baud = ch->ch_custom_speed;
 			if (ch->ch_flags & CH_BAUD0)
 				ch->ch_flags &= ~(CH_BAUD0);
-		} else {
-			int i= 0;
-			struct baud_rates {
-				unsigned int rate;
-				unsigned int cflag;
-			};
-			static struct baud_rates baud_rates[] = {
-				{ 921600, B921600 },
-				{ 460800, B460800 },
-				{ 230400, B230400 },
-				{ 115200, B115200 },
-				{  57600, B57600  },
-				{  38400, B38400  },
-				{  19200, B19200  },
-				{   9600, B9600   },
-				{   4800, B4800   },
-				{   2400, B2400   },
-				{   1200, B1200   },
-				{    600, B600    },
-				{    300, B300    },
-				{    200, B200    },
-				{    150, B150    },
-				{    134, B134    },
-				{    110, B110    },
-				{     75, B75     },
-				{     50, B50     },
-				{      0, B600	  }
-			};
+	} else {
+		int i;
+		unsigned int cflag;
+		static struct {
+			unsigned int rate;
+			unsigned int cflag;
+		} baud_rates[] = {
+			{ 921600, B921600 },
+			{ 460800, B460800 },
+			{ 230400, B230400 },
+			{ 115200, B115200 },
+			{  57600, B57600  },
+			{  38400, B38400  },
+			{  19200, B19200  },
+			{   9600, B9600   },
+			{   4800, B4800   },
+			{   2400, B2400   },
+			{   1200, B1200   },
+			{    600, B600    },
+			{    300, B300    },
+			{    200, B200    },
+			{    150, B150    },
+			{    134, B134    },
+			{    110, B110    },
+			{     75, B75     },
+			{     50, B50     },
+		};
 
-			baud = C_BAUD(ch->uart_port.info->tty);
-
-			for (i = 0; baud_rates[i].rate; i++) {
-				if (baud_rates[i].cflag == baud)
-					break;
+		cflag = C_BAUD(ch->uart_port.info->tty);
+		baud = 9600;
+		for (i = 0; i < ARRAY_SIZE(baud_rates); i++) {
+			if (baud_rates[i].cflag == cflag) {
+				baud = baud_rates[i].rate;
+				break;
 			}
-			baud = baud_rates[i].rate;
-
-			if (baud == 0)
-				baud = 9600;
-
-			if (ch->ch_flags & CH_BAUD0)
-				ch->ch_flags &= ~(CH_BAUD0);
 		}
 
+		if (ch->ch_flags & CH_BAUD0)
+			ch->ch_flags &= ~(CH_BAUD0);
+	}
+
 	if (ch->ch_c_cflag & PARENB)
 		lcr |= UART_LCR_PARITY;
 
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/