28c28
< __FBSDID("$FreeBSD: head/sys/dev/uart/uart_dev_z8530.c 120378 2003-09-23 09:25:38Z nyan $");
---
> __FBSDID("$FreeBSD: head/sys/dev/uart/uart_dev_z8530.c 120452 2003-09-26 05:14:56Z marcel $");
45,47d44
< #define IS_CHANNEL_A(bas) (((bas)->iobase & 7) != 0)
< #define IS_CHANNEL_B(bas) (((bas)->iobase & 7) == 0)
<
147c144
< uint8_t tpc;
---
> uint8_t mic, tpc;
153,154c150,159
< uart_setmreg(bas, WR_MIC, ((IS_CHANNEL_A(bas)) ? MIC_CRA : MIC_CRB) |
< MIC_MIE | MIC_NV);
---
> mic = MIC_MIE | MIC_NV;
> switch (bas->chan) {
> case 1:
> mic |= MIC_CRA;
> break;
> case 2:
> mic |= MIC_CRB;
> break;
> }
> uart_setmreg(bas, WR_MIC, mic);
436d440
< const char *ch;
437a442
> char ch;
443,444c448
< /* Assume the address range is naturally aligned. */
< ch = IS_CHANNEL_A(&sc->sc_bas) ? "A" : "B";
---
> ch = sc->sc_bas.chan - 1 + 'A';
446c450
< snprintf(buf, sizeof(buf), "z8530, channel %s", ch);
---
> snprintf(buf, sizeof(buf), "z8530, channel %c", ch);