31c31
< __FBSDID("$FreeBSD: head/sys/dev/ppbus/immio.c 184130 2008-10-21 18:30:10Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ppbus/immio.c 185003 2008-11-16 17:42:02Z jhb $");
253c253
< MS_RASSERT_P(1, MS_REG_DTR),
---
> MS_RASSERT_P(1, MS_REG_DTR),
256c256
< MS_RASSERT_P(1, MS_REG_DTR),
---
> MS_RASSERT_P(1, MS_REG_DTR),
268c268
< MS_RASSERT_P(MS_ACCUM, MS_REG_EPP_D),
---
> MS_RASSERT_P(MS_ACCUM, MS_REG_EPP_D),
275c275
< MS_RFETCH_P(MS_ACCUM, MS_REG_EPP_D, MS_FETCH_ALL),
---
> MS_RFETCH_P(MS_ACCUM, MS_REG_EPP_D, MS_FETCH_ALL),
419c419
< /* ensure we are disconnected or daisy chained peripheral
---
> /* ensure we are disconnected or daisy chained peripheral
482c482
<
---
>
517c517
< return (0); /* command timed out */
---
> return (0); /* command timed out */
543c543
<
---
>
583c583
< DECLARE_NIBBLE_INBYTE_SUBMICROSEQ;
---
> DECLARE_NIBBLE_INBYTE_SUBMICROSEQ;
604c604
< INB_NIBBLE_P, (void *)&(vpo)->vpo_nibble);
---
> INB_NIBBLE_P, (void *)&(vpo)->vpo_nibble);
669c669
< int
---
> int
693c693,694
< *ret = VP0_ECONNECT; goto error;
---
> *ret = VP0_ECONNECT;
> goto error;
717c718,719
< *ret = VP0_ESTATUS_TIMEOUT; goto error;
---
> *ret = VP0_ESTATUS_TIMEOUT;
> goto error;
728,729c730,731
< /*
< * Complete transfer ...
---
> /*
> * Complete transfer ...
735c737,738
< *ret = VP0_ESTATUS_TIMEOUT; goto error;
---
> *ret = VP0_ESTATUS_TIMEOUT;
> goto error;
785c788,789
< *ret = VP0_EOTHER; goto error;
---
> *ret = VP0_EOTHER;
> goto error;
791c795,796
< *ret = VP0_EOTHER+2; goto error;
---
> *ret = VP0_EOTHER + 2;
> goto error;