diff options
Diffstat (limited to 'sys/dev/pci')
-rw-r--r-- | sys/dev/pci/pciide.c | 26 | ||||
-rw-r--r-- | sys/dev/pci/pciide_acard_reg.h | 2 | ||||
-rw-r--r-- | sys/dev/pci/pciide_acer_reg.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/pciide_amd_reg.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/pciide_apollo_reg.h | 4 | ||||
-rw-r--r-- | sys/dev/pci/pciide_cmd_reg.h | 4 | ||||
-rw-r--r-- | sys/dev/pci/pciide_cy693_reg.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/pciide_hpt_reg.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/pciide_natsemi_reg.h | 4 | ||||
-rw-r--r-- | sys/dev/pci/pciide_pdc202xx_reg.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/pciide_piix_reg.h | 6 | ||||
-rw-r--r-- | sys/dev/pci/pciide_sis_reg.h | 4 | ||||
-rw-r--r-- | sys/dev/pci/pciidereg.h | 4 |
13 files changed, 42 insertions, 42 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 9ead2c8544f..3159209bfc0 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.138 2003/08/01 11:05:09 grange Exp $ */ +/* $OpenBSD: pciide.c,v 1.139 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -870,7 +870,7 @@ pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep, pci_intr) printf("%s: couldn't map native-PCI interrupt\n", sc->sc_wdcdev.sc_dev.dv_xname); return 0; - } + } intrstr = pci_intr_string(pa->pa_pc, intrhandle); #ifdef __OpenBSD__ sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, @@ -1022,7 +1022,7 @@ pciide_intr_flag(struct pciide_channel *cp) } DELAY(5); } - + /* Not for us. */ if (retry == 0) return (0); @@ -1214,7 +1214,7 @@ pciide_dma_init(v, channel, drive, databuf, datalen, flags) } bus_dmamap_sync(sc->sc_dmat, dma_maps->dmamap_xfer, 0, - dma_maps->dmamap_xfer->dm_mapsize, + dma_maps->dmamap_xfer->dm_mapsize, (flags & WDC_DMA_READ) ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); @@ -2085,7 +2085,7 @@ piix3_4_setup_channel(chp) } } idedma_ctl |= IDEDMA_CTL_DRV_DMA(drive); - + pio: /* use PIO mode */ idetim |= piix_setup_idetim_drvs(drvp); if (drive == 0) { @@ -2119,7 +2119,7 @@ piix_setup_idetim_timings(mode, dma, channel) u_int8_t dma; u_int8_t channel; { - + if (dma) return PIIX_IDETIM_SET(0, PIIX_IDETIM_ISP_SET(piix_isp_dma[mode]) | @@ -2224,7 +2224,7 @@ amd756_chip_map(sc, pa) if (sc->sc_dma_ok) { sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA; sc->sc_wdcdev.cap |= WDC_CAPABILITY_IRQACK; - sc->sc_wdcdev.irqack = pciide_irqack; + sc->sc_wdcdev.irqack = pciide_irqack; } sc->sc_wdcdev.PIO_cap = 4; sc->sc_wdcdev.DMA_cap = 2; @@ -2410,8 +2410,8 @@ apollo_chip_map(sc, pa) pcib_tag = pci_make_tag(pa->pa_pc, pa->pa_bus, pa->pa_device, 0); pcib_id = pci_conf_read(sc->sc_pc, pcib_tag, PCI_ID_REG); - pcib_class = pci_conf_read(sc->sc_pc, pcib_tag, PCI_CLASS_REG); - + pcib_class = pci_conf_read(sc->sc_pc, pcib_tag, PCI_CLASS_REG); + switch (PCI_PRODUCT(pcib_id)) { case PCI_PRODUCT_VIATECH_VT82C586_ISA: if (PCI_REVISION(pcib_class) >= 0x02) { @@ -2479,7 +2479,7 @@ apollo_chip_map(sc, pa) sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS; pciide_print_channels(sc->sc_wdcdev.nchannels, interface); - + WDCDEBUG_PRINT(("apollo_chip_map: old APO_IDECONF=0x%x, " "APO_CTLMISC=0x%x, APO_DATATIM=0x%x, APO_UDMA=0x%x\n", pci_conf_read(sc->sc_pc, sc->sc_tag, APO_IDECONF), @@ -2592,7 +2592,7 @@ apollo_setup_channel(chp) /* 596b or 686a */ udmatim_reg |= APO_UDMA_CLK66(chp->channel); udmatim_reg |= APO_UDMA_TIME(chp->channel, - drive, apollo_udma66_tim[drvp->UDMA_mode]); + drive, apollo_udma66_tim[drvp->UDMA_mode]); } else { /* 596a or 586b */ udmatim_reg |= APO_UDMA_TIME(chp->channel, @@ -4142,7 +4142,7 @@ acer_chip_map(sc, pa) printf("%s: %s ignored (disabled)\n", sc->sc_wdcdev.sc_dev.dv_xname, cp->name); continue; - } + } pciide_map_compat_intr(pa, cp, channel, interface); if (cp->hw_ok == 0) continue; @@ -4949,7 +4949,7 @@ pdc20268_setup_channel(chp) pciide_channel_dma_setup(cp); idedma_ctl = 0; - + for (drive = 0; drive < 2; drive++) { drvp = &chp->ch_drive[drive]; /* If no drive, skip */ diff --git a/sys/dev/pci/pciide_acard_reg.h b/sys/dev/pci/pciide_acard_reg.h index 601da4579c4..c97f199eff3 100644 --- a/sys/dev/pci/pciide_acard_reg.h +++ b/sys/dev/pci/pciide_acard_reg.h @@ -17,7 +17,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY diff --git a/sys/dev/pci/pciide_acer_reg.h b/sys/dev/pci/pciide_acer_reg.h index bd9913ae90f..3793ad82931 100644 --- a/sys/dev/pci/pciide_acer_reg.h +++ b/sys/dev/pci/pciide_acer_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_acer_reg.h,v 1.5 2003/02/21 20:10:33 grange Exp $ */ +/* $OpenBSD: pciide_acer_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_acer_reg.h,v 1.4 2001/07/26 20:02:22 bouyer Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY @@ -96,7 +96,7 @@ * IDE bus frequency (1 byte) * This should be setup by the BIOS - can we rely on this ? */ -#define ACER_IDE_CLK 0x78 +#define ACER_IDE_CLK 0x78 /* acer UDMA3/4/5 from FreeBSD */ static int8_t acer_udma[] = {0x4, 0x3, 0x2, 0x1, 0x0, 0x7}; diff --git a/sys/dev/pci/pciide_amd_reg.h b/sys/dev/pci/pciide_amd_reg.h index 94f9bbdad8b..775955db478 100644 --- a/sys/dev/pci/pciide_amd_reg.h +++ b/sys/dev/pci/pciide_amd_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_amd_reg.h,v 1.5 2003/02/13 15:30:21 grange Exp $ */ +/* $OpenBSD: pciide_amd_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_amd_reg.h,v 1.2 2000/07/06 15:08:11 bouyer Exp $ */ /* @@ -46,9 +46,9 @@ /* * The AMD756 chip revision D2 has a bug affecting DMA (but not UDMA) - * modes. The workaround documented by AMD is to not use DMA on any + * modes. The workaround documented by AMD is to not use DMA on any * drive which does not support UDMA modes. - * + * * See: http://www.amd.com/products/cpg/athlon/techdocs/pdf/22591.pdf */ #define AMD756_CHIPREV_DISABLEDMA(product, rev) \ diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h index e84bc20224f..3784bcb5d3a 100644 --- a/sys/dev/pci/pciide_apollo_reg.h +++ b/sys/dev/pci/pciide_apollo_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_apollo_reg.h,v 1.7 2003/02/21 20:10:33 grange Exp $ */ +/* $OpenBSD: pciide_apollo_reg.h,v 1.8 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_apollo_reg.h,v 1.8 2001/01/05 18:04:43 bouyer Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY diff --git a/sys/dev/pci/pciide_cmd_reg.h b/sys/dev/pci/pciide_cmd_reg.h index a5cb3ef8043..a6911c6e375 100644 --- a/sys/dev/pci/pciide_cmd_reg.h +++ b/sys/dev/pci/pciide_cmd_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_cmd_reg.h,v 1.7 2003/07/05 08:42:45 grange Exp $ */ +/* $OpenBSD: pciide_cmd_reg.h,v 1.8 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_cmd_reg.h,v 1.9 2000/08/02 20:23:46 bouyer Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY diff --git a/sys/dev/pci/pciide_cy693_reg.h b/sys/dev/pci/pciide_cy693_reg.h index 02367e17e9c..4185de6c3f8 100644 --- a/sys/dev/pci/pciide_cy693_reg.h +++ b/sys/dev/pci/pciide_cy693_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_cy693_reg.h,v 1.4 2003/02/21 20:10:33 grange Exp $ */ +/* $OpenBSD: pciide_cy693_reg.h,v 1.5 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_cy693_reg.h,v 1.4 2000/05/15 08:46:01 bouyer Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY @@ -72,7 +72,7 @@ static int8_t cy_dma_rec[] = {7, 1, 0}; /* * The cypress is quite weird: it uses 8-bit ISA registers to control - * DMA modes. + * DMA modes. */ #define CY_DMA_ADDR 0x22 diff --git a/sys/dev/pci/pciide_hpt_reg.h b/sys/dev/pci/pciide_hpt_reg.h index c1d62e5c4f4..fb41c93d22d 100644 --- a/sys/dev/pci/pciide_hpt_reg.h +++ b/sys/dev/pci/pciide_hpt_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_hpt_reg.h,v 1.8 2003/07/29 18:16:27 grange Exp $ */ +/* $OpenBSD: pciide_hpt_reg.h,v 1.9 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_hpt_reg.h,v 1.4 2001/07/23 14:55:27 bouyer Exp $ */ /* @@ -21,7 +21,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY @@ -135,7 +135,7 @@ static u_int32_t hpt370_pio[] = {0x06914e8a, 0x06914e65, 0x06514e33, 0x06514e22, 0x06514e21}; static u_int32_t hpt370_dma[] = {0x26514e97, 0x26514e33, 0x26514e21}; -static u_int32_t hpt370_udma[] = +static u_int32_t hpt370_udma[] = {0x16514e31, 0x164d4e31, 0x16494e31, 0x166d4e31, 0x16454e31, 0x16454e31}; diff --git a/sys/dev/pci/pciide_natsemi_reg.h b/sys/dev/pci/pciide_natsemi_reg.h index f9023eff709..f9f4cc2d95b 100644 --- a/sys/dev/pci/pciide_natsemi_reg.h +++ b/sys/dev/pci/pciide_natsemi_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_natsemi_reg.h,v 1.3 2003/06/02 19:08:58 jason Exp $ */ +/* $OpenBSD: pciide_natsemi_reg.h,v 1.4 2003/09/28 21:01:43 grange Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -35,7 +35,7 @@ #define NATSEMI_CTRL1 0x40 /* Control register1 */ #define NATSEMI_CTRL1_SWRST 0x04 /* sw rst to ch1/ch2 on */ #define NATSEMI_CTRL1_IDEPWR 0x08 -#define NATSEMI_CTRL1_CH1INTMAP 0x10 +#define NATSEMI_CTRL1_CH1INTMAP 0x10 #define NATSEMI_CTRL1_CH2INTMAP 0x20 #define NATSEMI_CTRL1_INTAMASK 0x40 #define NATSEMI_CTRL1_IDWR 0x80 /* write to did/vid enable */ diff --git a/sys/dev/pci/pciide_pdc202xx_reg.h b/sys/dev/pci/pciide_pdc202xx_reg.h index 075416159fb..d5b933e0076 100644 --- a/sys/dev/pci/pciide_pdc202xx_reg.h +++ b/sys/dev/pci/pciide_pdc202xx_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_pdc202xx_reg.h,v 1.9 2003/07/23 22:07:15 grange Exp $ */ +/* $OpenBSD: pciide_pdc202xx_reg.h,v 1.10 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_pdc202xx_reg.h,v 1.5 2001/07/05 08:38:27 toshii Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY @@ -87,7 +87,7 @@ #define PDC2xx_SCR_SET_POLL(r,x) (((r) & 0xff0fffff) | (((x) & 0xf) << 20)) #define PDC2xx_SCR_DMA 0x01000000 #define PDC2xx_SCR_IORDY 0x02000000 -#define PDC2xx_SCR_G2FD 0x04000000 +#define PDC2xx_SCR_G2FD 0x04000000 #define PDC2xx_SCR_FLOAT 0x08000000 #define PDC2xx_SCR_RSET 0x10000000 #define PDC2xx_SCR_TST 0x20000000 diff --git a/sys/dev/pci/pciide_piix_reg.h b/sys/dev/pci/pciide_piix_reg.h index 514837bda3f..f25bdb0f23c 100644 --- a/sys/dev/pci/pciide_piix_reg.h +++ b/sys/dev/pci/pciide_piix_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_piix_reg.h,v 1.5 2003/02/21 20:10:34 grange Exp $ */ +/* $OpenBSD: pciide_piix_reg.h,v 1.6 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_piix_reg.h,v 1.5 2001/01/05 15:29:40 bouyer Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY @@ -50,7 +50,7 @@ #define PIIX_BMIBA_RTE_IO 0x000000001 /* base addr maps to I/O space */ /* - * IDE timing register + * IDE timing register * 0x40/0x41 is for primary, 0x42/0x43 for secondary channel */ #define PIIX_IDETIM 0x40 diff --git a/sys/dev/pci/pciide_sis_reg.h b/sys/dev/pci/pciide_sis_reg.h index 07ec1479d4f..534774bdc78 100644 --- a/sys/dev/pci/pciide_sis_reg.h +++ b/sys/dev/pci/pciide_sis_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_sis_reg.h,v 1.4 2003/05/02 09:33:33 grange Exp $ */ +/* $OpenBSD: pciide_sis_reg.h,v 1.5 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciide_sis_reg.h,v 1.6 2000/05/15 08:46:01 bouyer Exp $ */ /* @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY diff --git a/sys/dev/pci/pciidereg.h b/sys/dev/pci/pciidereg.h index dd7f0f40d8c..4244ca789c6 100644 --- a/sys/dev/pci/pciidereg.h +++ b/sys/dev/pci/pciidereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciidereg.h,v 1.4 2002/11/20 21:33:37 grange Exp $ */ +/* $OpenBSD: pciidereg.h,v 1.5 2003/09/28 21:01:43 grange Exp $ */ /* $NetBSD: pciidereg.h,v 1.6 2000/11/14 18:42:58 thorpej Exp $ */ /* @@ -78,7 +78,7 @@ #define PCIIDE_CHANNEL_NAME(chan) ((chan) == 0 ? "channel 0" : "channel 1") /* - * definitions for IDE DMA + * definitions for IDE DMA * XXX maybe this should go elsewhere */ |