29c29
< __FBSDID("$FreeBSD: head/sys/dev/ppc/ppc.c 184176 2008-10-22 19:39:16Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ppc/ppc.c 185003 2008-11-16 17:42:02Z jhb $");
41c41
<
---
>
117,118c117,118
< ppc_ecp_sync(device_t dev) {
<
---
> ppc_ecp_sync(device_t dev)
> {
152c152
<
---
>
239c239
<
---
>
410c410
<
---
>
412c412
<
---
>
459c459
<
---
>
516c516
< ptr = inb(idport + 1);
---
> ptr = inb(idport + 1);
526c526
<
---
>
556c556
<
---
>
566c566
< ppc->ppc_avm |= PPB_EPP;
---
> ppc->ppc_avm |= PPB_EPP;
599,600c599,600
< if (bootverbose)
< printf(", SPP");
---
> if (bootverbose)
> printf(", SPP");
655c655
<
---
>
702c702
<
---
>
917c917
< outb(SMC935_DAT, 3); /* which is logical device 3 */
---
> outb(SMC935_DAT, 3); /* which is logical device 3 */
986c986
< static int w83877f_keys[] = { 0x89, 0x86, 0x87, 0x88 };
---
> static int w83877f_keys[] = { 0x89, 0x86, 0x87, 0x88 };
1325c1325
< switch (mi->opcode) {
---
> switch (mi->opcode) {
1330c1330
< w_reg(mi->arg[0].i, ppc, cc);
---
> w_reg(mi->arg[0].i, ppc, cc);
1332c1332
< break;
---
> break;
1351c1351
< case MS_OP_RFETCH_P:
---
> case MS_OP_RFETCH_P:
1367c1367
< break;
---
> break;
1369c1369
< case MS_OP_RFETCH:
---
> case MS_OP_RFETCH:
1373c1373
< break;
---
> break;
1376,1377c1376,1377
< case MS_OP_DELAY:
<
---
> case MS_OP_DELAY:
>
1409,1410c1409,1410
< case MS_OP_SET:
< ppc->ppc_accum = mi->arg[0].i;
---
> case MS_OP_SET:
> ppc->ppc_accum = mi->arg[0].i;
1412c1412
< break;
---
> break;
1414,1416c1414,1416
< case MS_OP_DBRA:
< if (--ppc->ppc_accum > 0)
< mi += mi->arg[0].i;
---
> case MS_OP_DBRA:
> if (--ppc->ppc_accum > 0)
> mi += mi->arg[0].i;
1418c1418
< break;
---
> break;
1420,1423c1420,1423
< case MS_OP_BRSET:
< cc = r_str(ppc);
< if ((cc & (char)mi->arg[0].i) == (char)mi->arg[0].i)
< mi += mi->arg[1].i;
---
> case MS_OP_BRSET:
> cc = r_str(ppc);
> if ((cc & (char)mi->arg[0].i) == (char)mi->arg[0].i)
> mi += mi->arg[1].i;
1425c1425
< break;
---
> break;
1427,1430c1427,1430
< case MS_OP_BRCLEAR:
< cc = r_str(ppc);
< if ((cc & (char)mi->arg[0].i) == 0)
< mi += mi->arg[1].i;
---
> case MS_OP_BRCLEAR:
> cc = r_str(ppc);
> if ((cc & (char)mi->arg[0].i) == 0)
> mi += mi->arg[1].i;
1432c1432
< break;
---
> break;
1487,1489c1487,1489
< case MS_OP_PUT:
< case MS_OP_GET:
< case MS_OP_RET:
---
> case MS_OP_PUT:
> case MS_OP_GET:
> case MS_OP_RET:
1502,1505c1502,1505
< default:
< panic("%s: unknown microsequence opcode 0x%x",
< __func__, mi->opcode);
< }
---
> default:
> panic("%s: unknown microsequence opcode 0x%x",
> __func__, mi->opcode);
> }
1608c1608
<
---
>
1671,1672c1671
< "parallel port found at 0x%x\n",
< (int) port);
---
> "parallel port found at 0x%lx\n", port);
1675,1677c1674,1676
< if((next_bios_ppc < BIOS_MAX_PPC) &&
< (*(BIOS_PORTS+next_bios_ppc) != 0) ) {
< port = *(BIOS_PORTS+next_bios_ppc++);
---
> if ((next_bios_ppc < BIOS_MAX_PPC) &&
> (*(BIOS_PORTS + next_bios_ppc) != 0)) {
> port = *(BIOS_PORTS + next_bios_ppc++);
1679,1680c1678,1679
< device_printf(dev, "parallel port found at 0x%x\n",
< (int) port);
---
> device_printf(dev,
> "parallel port found at 0x%lx\n", port);
1683c1682
< return ENXIO;
---
> return (ENXIO);
1807c1806
<
---
>
1886a1886
>