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

Brucify.

Browse Source 
Requested and reviewed by:	bde
MFC after:	2 weeks
This commit is contained in:
sobomax 2003-03-18 21:26:28 +00:00
parent 4344c66917
commit b552d09bc1
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/dev/sio/sio.c
View File

@ -120,7 +120,7 @@
#define COM_C_IIR_TXRDYBUG (0x80000)
#define COM_IIR_TXRDYBUG(flags) ((flags) & COM_C_IIR_TXRDYBUG)
#define COM_NOSCR(flags) ((flags) & 0x100000)
#define COM_TI16754(flags) ((flags) & 0x200000)
#define COM_TI16754(flags) ((flags) & 0x200000)
#define COM_FIFOSIZE(flags) (((flags) & 0xff000000) >> 24)
#define sio_getreg(com, off) \
@ -606,32 +606,28 @@ sioprobe(dev, xrid, rclk, noprobe)
/* EXTRA DELAY? */
/*
* For the TI16754 chips set prescaler to 1 (4 is often the
* default after-reset value), otherwise it's impossible to
* For the TI16754 chips, set prescaler to 1 (4 is often the
* default after-reset value) as otherwise it's impossible to
* get highest baudrates.
*/
if (COM_TI16754(flags)) {
u_char t1, t2;
u_char cfcr, efr;
/* Save LCR */
t1 = sio_getreg(com, com_lctl);
/* Enable EFR */
sio_setreg(com, com_lctl, 0xbf);
/* Save EFR */
t2 = sio_getreg(com, com_iir);
/* Unlock MCR[7] */
sio_setreg(com, com_iir, t2 | 0x10);
/* Disable EFR */
sio_setreg(com, com_lctl, 0);
/* Set prescaler to 1 */
sio_setreg(com, com_mcr, sio_getreg(com, com_mcr) & 0x7f);
/* Enable EFR */
sio_setreg(com, com_lctl, 0xbf);
/* Restore EFR */
sio_setreg(com, com_iir, t2);
/* Restore LCR */
sio_setreg(com, com_lctl, t1);
cfcr = sio_getreg(com, com_cfcr);
sio_setreg(com, com_cfcr, CFCR_EFR_ENABLE);
efr = sio_getreg(com, com_efr);
/* Unlock extended features to turn off prescaler. */
sio_setreg(com, com_efr, efr | EFR_EFE);
/* Disable EFR. */
sio_setreg(com, com_cfcr, (cfcr != CFCR_EFR_ENABLE) ? cfcr : 0);
/* Turn off prescaler. */
sio_setreg(com, com_mcr,
sio_getreg(com, com_mcr) & ~MCR_PRESCALE);
sio_setreg(com, com_cfcr, CFCR_EFR_ENABLE);
sio_setreg(com, com_efr, efr);
sio_setreg(com, com_cfcr, cfcr);
}
/*
* Initialize the speed and the word size and wait long enough to
* drain the maximum of 16 bytes of junk in device output queues.

8
sys/dev/sio/sioreg.h
View File

@ -63,7 +63,7 @@
#define FIFO_RX_MEDH 0x80
#define FIFO_RX_HIGH 0xc0
/* character format control register */
/* character format control register (aka line control register) */
#define CFCR_DLAB 0x80
#define CFCR_SBREAK 0x40
#define CFCR_PZERO 0x30
@ -76,8 +76,10 @@
#define CFCR_7BITS 0x02
#define CFCR_6BITS 0x01
#define CFCR_5BITS 0x00
#define CFCR_EFR_ENABLE 0xbf /* magic to enable EFR on 16650 up */
/* modem control register */
#define MCR_PRESCALE 0x80 /* only available on 16650 up */
#define MCR_LOOPBACK 0x10
#define MCR_IENABLE 0x08
#define MCR_DRS 0x04
@ -105,6 +107,10 @@
#define MSR_DDSR 0x02
#define MSR_DCTS 0x01
/* enhanced feature register (only available on 16650 up) */
#define com_efr com_fifo
#define EFR_EFE 0x10 /* enhanced functions enable */
#ifdef PC98
/* Hardware extension mode register for RSB-2000/3000. */
#define com_emr com_msr