31c31
< __FBSDID("$FreeBSD: head/sys/dev/ppbus/vpoio.c 184130 2008-10-21 18:30:10Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ppbus/vpoio.c 185003 2008-11-16 17:42:02Z jhb $");
221c221
< MS_RASSERT_P(1, MS_REG_DTR),
---
> MS_RASSERT_P(1, MS_REG_DTR),
236c236
< MS_RASSERT_P(1, MS_REG_EPP_D),
---
> MS_RASSERT_P(1, MS_REG_EPP_D),
251c251
< MS_RFETCH_P(1, MS_REG_EPP_D, MS_FETCH_ALL),
---
> MS_RFETCH_P(1, MS_REG_EPP_D, MS_FETCH_ALL),
300c300
< return error;
---
> return (error);
317c317
< vpoio_reset (struct vpoio_data *vpo)
---
> vpoio_reset(struct vpoio_data *vpo)
366c366
< return (error);
---
> return (error);
419c419
< /* ensure we are disconnected or daisy chained peripheral
---
> /* ensure we are disconnected or daisy chained peripheral
502c502
<
---
>
548c548
< return (0); /* command timed out */
---
> return (0); /* command timed out */
589c589
< DECLARE_NIBBLE_INBYTE_SUBMICROSEQ;
---
> DECLARE_NIBBLE_INBYTE_SUBMICROSEQ;
607c607
< INB_NIBBLE_P, (void *)&(vpo)->vpo_nibble);
---
> INB_NIBBLE_P, (void *)&(vpo)->vpo_nibble);
675c675
< int
---
> int
698c698,699
< *ret = VP0_ECONNECT; goto error;
---
> *ret = VP0_ECONNECT;
> goto error;
722,723c723,724
< /*
< * Completion ...
---
> /*
> * Completion ...
730c731,732
< *ret = VP0_ESTATUS_TIMEOUT; goto error;
---
> *ret = VP0_ESTATUS_TIMEOUT;
> goto error;
766c768,769
< *ret = VP0_EOTHER; goto error;
---
> *ret = VP0_EOTHER;
> goto error;
772c775,776
< *ret = VP0_EOTHER+2; goto error;
---
> *ret = VP0_EOTHER + 2;
> goto error;