提交 a8c72504 编写于 作者: L Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] typo: buad -> baud
...@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -86,7 +86,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -149,7 +149,7 @@ void serial_set(int channel, unsigned long baud) ...@@ -149,7 +149,7 @@ void serial_set(int channel, unsigned long baud)
#else #else
/* /*
* Note: Set baud rate, hardcoded here for rate of 115200 * Note: Set baud rate, hardcoded here for rate of 115200
* since became unsure of above "buad rate" algorithm (??). * since became unsure of above "baud rate" algorithm (??).
*/ */
outreg(channel, LCR, 0x83); outreg(channel, LCR, 0x83);
outreg(channel, DLM, 0x00); // See note above outreg(channel, DLM, 0x00); // See note above
......
...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -72,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -72,7 +72,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) ...@@ -73,7 +73,7 @@ void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop)
/* disable interrupts */ /* disable interrupts */
UART16550_WRITE(OFS_INTR_ENABLE, 0); UART16550_WRITE(OFS_INTR_ENABLE, 0);
/* set up buad rate */ /* set up baud rate */
{ {
uint32 divisor; uint32 divisor;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define UARTDR 0x00 /* Tx/Rx data */ #define UARTDR 0x00 /* Tx/Rx data */
#define RXSTAT 0x04 /* Rx status */ #define RXSTAT 0x04 /* Rx status */
#define H_UBRLCR 0x08 /* mode register high */ #define H_UBRLCR 0x08 /* mode register high */
#define M_UBRLCR 0x0C /* mode reg mid (MSB of buad)*/ #define M_UBRLCR 0x0C /* mode reg mid (MSB of baud)*/
#define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/ #define L_UBRLCR 0x10 /* mode reg low (LSB of baud)*/
#define UARTCON 0x14 /* control register */ #define UARTCON 0x14 /* control register */
#define UARTFLG 0x18 /* flag register */ #define UARTFLG 0x18 /* flag register */
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Changelog: * Changelog:
* 05-01-2000 SJH Created * 05-01-2000 SJH Created
* 05-13-2000 SJH Filled in function bodies * 05-13-2000 SJH Filled in function bodies
* 07-26-2000 SJH Removed hard coded buad rate * 07-26-2000 SJH Removed hard coded baud rate
*/ */
#include <asm/hardware.h> #include <asm/hardware.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册