d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic change (align with other boot blocks):

Browse Source 
CONSPEED -> COMSPEED

Approved by:	nyan
This commit is contained in:
Nick Hibma 2002-05-26 10:11:17 +00:00
parent fcf867e9f7
commit 44b279e2f6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=97301
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/boot/pc98/boot2/Makefile
View File

@ -27,7 +27,7 @@ CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
# feature not implemented
BOOT_COMCONSOLE_SPEED?=9600
CFLAGS+= -DCONSPEED=${BOOT_COMCONSOLE_SPEED}
CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
# Enable code to take the default boot string from a fixed location on the
# disk. See nextboot(8) and README.386BSD for more info.

8
sys/boot/pc98/boot2/serial_16550.S
View File

@ -80,7 +80,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* BIOS support is duplicated here.
*
* The base address and speed for the i/o port are passed from the
* Makefile in the COMCONSOLE and CONSPEED preprocessor macros. The
* Makefile in the COMCONSOLE and COMSPEED preprocessor macros. The
* line control parameters are currently hard-coded to 8 bits, no
* parity, 1 stop bit (8N1). This can be changed in init_serial().
*/
@ -143,7 +143,7 @@ ENTRY(serial_ischar)
/*
* void init_serial(void);
* Initialize port COMCONSOLE to speed CONSPEED, line settings 8N1.
* Initialize port COMCONSOLE to speed COMSPEED, line settings 8N1.
*/
ENTRY(init_serial)
movl $COMCONSOLE + 3, %edx # line control reg
@ -151,10 +151,10 @@ ENTRY(init_serial)
outb %al, %dx # enable DLAB
subl $3, %edx # divisor latch, low byte
movb (1843200 / (16*(CONSPEED))) & 0xff, %al
movb (1843200 / (16*(COMSPEED))) & 0xff, %al
outb %al, %dx
incl %edx # divisor latch, high byte
movb (1843200 / (16*(CONSPEED))) >> 8, %al
movb (1843200 / (16*(COMSPEED))) >> 8, %al
outb %al, %dx
incl %edx # fifo control register (if any)