34c34
< * $FreeBSD: head/sys/dev/firewire/fwohci.c 129541 2004-05-21 09:12:07Z dfr $
---
> * $FreeBSD: head/sys/dev/firewire/fwohci.c 129585 2004-05-22 16:14:17Z dfr $
97c97
< u_int32_t tagbit[4] = { 1 << 28, 1 << 29, 1 << 30, 1 << 31};
---
> uint32_t tagbit[4] = { 1 << 28, 1 << 29, 1 << 30, 1 << 31};
133,134c133,134
< static u_int32_t fwphy_wrdata ( struct fwohci_softc *, u_int32_t, u_int32_t);
< static u_int32_t fwphy_rddata ( struct fwohci_softc *, u_int32_t);
---
> static uint32_t fwphy_wrdata ( struct fwohci_softc *, uint32_t, uint32_t);
> static uint32_t fwphy_rddata ( struct fwohci_softc *, uint32_t);
140c140
< static void fwohci_irx_post (struct firewire_comm *, u_int32_t *);
---
> static void fwohci_irx_post (struct firewire_comm *, uint32_t *);
149,152c149,152
< static void dump_db (struct fwohci_softc *, u_int32_t);
< static void print_db (struct fwohcidb_tr *, struct fwohcidb *, u_int32_t , u_int32_t);
< static void dump_dma (struct fwohci_softc *, u_int32_t);
< static u_int32_t fwohci_cyctimer (struct firewire_comm *);
---
> static void dump_db (struct fwohci_softc *, uint32_t);
> static void print_db (struct fwohcidb_tr *, struct fwohcidb *, uint32_t , uint32_t);
> static void dump_dma (struct fwohci_softc *, uint32_t);
> static uint32_t fwohci_cyctimer (struct firewire_comm *);
261,262c261,262
< static u_int32_t
< fwphy_wrdata( struct fwohci_softc *sc, u_int32_t addr, u_int32_t data)
---
> static uint32_t
> fwphy_wrdata( struct fwohci_softc *sc, uint32_t addr, uint32_t data)
264c264
< u_int32_t fun;
---
> uint32_t fun;
276c276
< static u_int32_t
---
> static uint32_t
281c281
< u_int32_t bm;
---
> uint32_t bm;
303c303
< static u_int32_t
---
> static uint32_t
306c306
< u_int32_t fun, stat;
---
> uint32_t fun, stat;
355c355
< u_int32_t *dmach = (u_int32_t *) data;
---
> uint32_t *dmach = (uint32_t *) data;
416c416
< u_int32_t reg, reg2;
---
> uint32_t reg, reg2;
491c491
< u_int32_t reg, reg2;
---
> uint32_t reg, reg2;
597,598c597,598
< u_int32_t reg;
< u_int8_t ui[8];
---
> uint32_t reg;
> uint8_t ui[8];
704c704
< fwdma_malloc(&sc->fc, sizeof(u_int32_t), sizeof(u_int32_t),
---
> fwdma_malloc(&sc->fc, sizeof(uint32_t), sizeof(uint32_t),
770c770
< u_int32_t
---
> uint32_t
845c845
< u_int32_t off;
---
> uint32_t off;
851c851
< u_int32_t *ld;
---
> uint32_t *ld;
1040c1040
< u_int32_t off;
---
> uint32_t off;
1314c1314
< fwohci_irx_post (struct firewire_comm *fc , u_int32_t *qld)
---
> fwohci_irx_post (struct firewire_comm *fc , uint32_t *qld)
1326c1326
< u_int32_t off = 0;
---
> uint32_t off = 0;
1385c1385
< u_int32_t off = 0;
---
> uint32_t off = 0;
1494c1494
< u_int32_t stat;
---
> uint32_t stat;
1610c1610
< u_int32_t stat;
---
> uint32_t stat;
1765c1765
< fwohci_intr_body(struct fwohci_softc *sc, u_int32_t stat, int count)
---
> fwohci_intr_body(struct fwohci_softc *sc, uint32_t stat, int count)
1767c1767
< u_int32_t irstat, itstat;
---
> uint32_t irstat, itstat;
1883c1883
< u_int32_t *buf, node_id;
---
> uint32_t *buf, node_id;
1933c1933
< buf = (u_int32_t *)malloc(OHCI_SIDSIZE, M_FW, M_NOWAIT);
---
> buf = (uint32_t *)malloc(OHCI_SIDSIZE, M_FW, M_NOWAIT);
1991c1991
< u_int32_t stat;
---
> uint32_t stat;
2003c2003
< static u_int32_t
---
> static uint32_t
2006c2006
< u_int32_t stat, irstat, itstat;
---
> uint32_t stat, irstat, itstat;
2035c2035
< u_int32_t stat;
---
> uint32_t stat;
2037c2037
< u_int32_t bus_reset = 0;
---
> uint32_t bus_reset = 0;
2070c2070
< u_int32_t stat;
---
> uint32_t stat;
2116c2116
< u_int32_t stat, count;
---
> uint32_t stat, count;
2162c2162
< u_int32_t stat;
---
> uint32_t stat;
2215c2215
< dump_dma(struct fwohci_softc *sc, u_int32_t ch)
---
> dump_dma(struct fwohci_softc *sc, uint32_t ch)
2217c2217
< u_int32_t off, cntl, stat, cmd, match;
---
> uint32_t off, cntl, stat, cmd, match;
2260c2260
< dump_db(struct fwohci_softc *sc, u_int32_t ch)
---
> dump_db(struct fwohci_softc *sc, uint32_t ch)
2266c2266
< u_int32_t cmd, off;
---
> uint32_t cmd, off;
2339c2339
< u_int32_t ch, u_int32_t max)
---
> uint32_t ch, uint32_t max)
2343c2343
< u_int32_t cmd, res;
---
> uint32_t cmd, res;
2430c2430
< u_int32_t fun;
---
> uint32_t fun;
2537c2537
< fwdma_bus_addr(it->buf, poffset) + sizeof(u_int32_t));
---
> fwdma_bus_addr(it->buf, poffset) + sizeof(uint32_t));
2571c2571
< dsiz[db_tr->dbcnt] = sizeof(u_int32_t);
---
> dsiz[db_tr->dbcnt] = sizeof(uint32_t);
2602c2602
< u_int32_t ld0;
---
> uint32_t ld0;
2653c2653
< r = info->hdr_len + sizeof(u_int32_t);
---
> r = info->hdr_len + sizeof(uint32_t);
2655c2655
< r += roundup2(fp->mode.wreqb.len, sizeof(u_int32_t));
---
> r += roundup2(fp->mode.wreqb.len, sizeof(uint32_t));
2657c2657
< if (r == sizeof(u_int32_t))
---
> if (r == sizeof(uint32_t))
2690,2691c2690,2691
< u_int8_t *ld;
< u_int32_t stat, off, status;
---
> uint8_t *ld;
> uint32_t stat, off, status;
2719c2719
< ld = (u_int8_t *)db_tr->buf;
---
> ld = (uint8_t *)db_tr->buf;
2818c2818
< dbch->buf_offset = ld - (u_int8_t *)db_tr->buf;
---
> dbch->buf_offset = ld - (uint8_t *)db_tr->buf;