diff options
-rw-r--r-- | sys/dev/firewire/firewire.c | 10 | ||||
-rw-r--r-- | sys/dev/firewire/fwohci.c | 14 | ||||
-rw-r--r-- | sys/dev/firewire/iec13213.h | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index a72e3843..a16c71c 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -828,7 +828,7 @@ void fw_init(struct firewire_comm *fc) ((fwb)->end < (addr))?1:0) /* - * To lookup binded process from IEEE1394 address. + * To lookup bound process from IEEE1394 address. */ struct fw_bind * fw_bindlookup(struct firewire_comm *fc, u_int16_t dest_hi, u_int32_t dest_lo) @@ -898,7 +898,7 @@ fw_bindremove(struct firewire_comm *fc, struct fw_bind *fwb) goto found; } - printf("%s: no such bind\n", __func__); + printf("%s: no such binding\n", __func__); splx(s); return (1); found: @@ -1532,7 +1532,7 @@ fw_bus_explore_callback(struct fw_xfer *xfer) if(sfp->mode.rreqq.dest_lo == (0xf0000000 | CSRROMOFF)){ rfp->mode.rresq.data = ntohl(rfp->mode.rresq.data); chdr = (struct csrhdr *)(&rfp->mode.rresq.data); -/* If CSR is minimal confinguration, more investgation is not needed. */ +/* If CSR is minimal confinguration, more investigation is not needed. */ if(chdr->info_len == 1){ if (firewire_debug) printf("node%d: minimal config\n", @@ -1702,7 +1702,7 @@ fw_attach_dev(struct firewire_comm *fc) } /* - * To allocate uniq transaction label. + * To allocate unique transaction label. */ static int fw_get_tlabel(struct firewire_comm *fc, struct fw_xfer *xfer) @@ -1797,7 +1797,7 @@ fw_rcv_copy(struct fw_rcv_buf *rb) } /* - * Generic packet receving process. + * Generic packet receiving process. */ void fw_rcv(struct fw_rcv_buf *rb) diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index afc58d5..ee9a358 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -491,10 +491,10 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev) u_int32_t reg, reg2; struct fwohcidb_tr *db_tr; - /* Disable interrupt */ + /* Disable interrupts */ OWRITE(sc, FWOHCI_INTMASKCLR, ~0); - /* Now stopping all DMA channel */ + /* Now stopping all DMA channels */ OWRITE(sc, OHCI_ARQCTLCLR, OHCI_CNTL_DMA_RUN); OWRITE(sc, OHCI_ARSCTLCLR, OHCI_CNTL_DMA_RUN); OWRITE(sc, OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN); @@ -580,7 +580,7 @@ fwohci_reset(struct fwohci_softc *sc, device_t dev) } - /* Enable interrupt */ + /* Enable interrupts */ OWRITE(sc, FWOHCI_INTMASK, OHCI_INT_ERR | OHCI_INT_PHY_SID | OHCI_INT_DMA_ATRQ | OHCI_INT_DMA_ATRS @@ -611,7 +611,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev) return (ENXIO); } -/* Available Isochrounous DMA channel probe */ +/* Available Isochronous DMA channel probe */ OWRITE(sc, OHCI_IT_MASK, 0xffffffff); OWRITE(sc, OHCI_IR_MASK, 0xffffffff); reg = OREAD(sc, OHCI_IT_MASK) & OREAD(sc, OHCI_IR_MASK); @@ -621,7 +621,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev) if ((reg & (1 << i)) == 0) break; sc->fc.nisodma = i; - device_printf(dev, "No. of Isochronous channel is %d.\n", i); + device_printf(dev, "No. of Isochronous channels is %d.\n", i); if (i == 0) return (ENXIO); @@ -692,7 +692,7 @@ fwohci_init(struct fwohci_softc *sc, device_t dev) #endif -/* SID recieve buffer must allign 2^11 */ +/* SID recieve buffer must align 2^11 */ #define OHCI_SIDSIZE (1 << 11) sc->sid_buf = fwdma_malloc(&sc->fc, OHCI_SIDSIZE, OHCI_SIDSIZE, &sc->sid_dma, BUS_DMA_WAITOK); @@ -1739,7 +1739,7 @@ fwohci_resume(struct fwohci_softc *sc, device_t dev) struct fw_bulkxfer *chunk; fwohci_reset(sc, dev); - /* XXX resume isochronus receive automatically. (how about TX?) */ + /* XXX resume isochronous receive automatically. (how about TX?) */ for(i = 0; i < sc->fc.nisodma; i ++) { ir = &sc->ir[i].xferq; if((ir->flag & FWXFERQ_RUNNING) != 0) { diff --git a/sys/dev/firewire/iec13213.h b/sys/dev/firewire/iec13213.h index 56d02a6..d4bba82 100644 --- a/sys/dev/firewire/iec13213.h +++ b/sys/dev/firewire/iec13213.h @@ -94,7 +94,7 @@ #define CSRKEY_DID 0x20 /* Directory_ID */ #define CSRKEY_REV 0x21 /* Revision */ -#define CSRKEY_FIRM_VER 0x3c /* Firemware version */ +#define CSRKEY_FIRM_VER 0x3c /* Firmware version */ #define CSRKEY_UNIT_CH 0x3a /* Unit characteristics */ #define CSRKEY_COM_SPEC 0x38 /* Command set revision */ #define CSRKEY_COM_SET 0x39 /* Command set */ |