28c28
< * $FreeBSD: head/sys/dev/ata/ata-all.h 56744 2000-01-28 13:35:43Z sos $
---
> * $FreeBSD: head/sys/dev/ata/ata-all.h 57325 2000-02-18 20:57:33Z sos $
89c89,90
< #define ATA_ALTPORT 0x206 /* alternate Status register */
---
> #define ATA_ALTPORT 0x206 /* alternate status register */
> #define ATA_ALTPORT_PCCARD 0x8 /* ditto on PCCARD devices */
93a95,96
> #define ATA_ALTIOSIZE 0x01
>
123a127,128
> #define ATA_BMIOSIZE 0x20
>
252,253d256
< int32_t unit; /* unit on this controller */
< int32_t lun; /* logical unit # */
255,257c258,265
< int32_t ioaddr; /* port addr */
< int32_t altioaddr; /* alternate port addr */
< int32_t bmaddr; /* bus master DMA port */
---
> int32_t unit; /* unit on this controller */
> struct resource *r_io; /* io addr resource handle */
> struct resource *r_altio; /* altio addr resource handle */
> struct resource *r_bmio; /* bmio addr resource handle */
> struct resource *r_irq; /* interrupt of this channel */
> int32_t ioaddr; /* physical port addr */
> int32_t altioaddr; /* physical alt port addr */
> int32_t bmaddr; /* physical bus master port */
277a286
> #define ATA_ATTACHED 0x08
300,303d308
< #if NAPM > 0
< struct apmhook resume_hook; /* hook for apm */
< #endif
<
306,308c311,312
< /* array to hold all ata softc's */
< extern struct ata_softc *atadevices[];
< #define MAXATA 16
---
> /* To convert unit numbers to devices */
> extern devclass_t ata_devclass;
315a320,328
> int ata_printf(struct ata_softc *, int32_t, const char *, ...) __printflike(3, 4);
> int ata_get_lun(u_int32_t *);
> void ata_free_lun(u_int32_t *, int);
> int8_t *ata_mode2str(int32_t);
> int8_t ata_pio2mode(int32_t);
> int ata_pmode(struct ata_params *);
> int ata_wmode(struct ata_params *);
> int ata_umode(struct ata_params *);
>
321,327d333
< int32_t ata_pmode(struct ata_params *);
< int32_t ata_wmode(struct ata_params *);
< int32_t ata_umode(struct ata_params *);
< int8_t *ata_mode2str(int32_t);
< int8_t ata_pio2mode(int32_t);
< int32_t ata_find_dev(device_t, int32_t);
< int32_t ata_printf(struct ata_softc *, int32_t, const char *, ...) __printflike(3, 4);