Diff for /src/sys/dev/disk/ata/ata-all.h between versions 1.3 and 1.4

version 1.3, 2003/07/19 21:14:18 version 1.4, 2003/11/30 20:14:18
Line 29 Line 29
  * $DragonFly$   * $DragonFly$
  */   */
   
   #ifndef _SYS_MPIPE_H_
   #include <sys/mpipe.h>
   #endif
   
 /* ATA register defines */  /* ATA register defines */
 #define ATA_DATA                        0x00    /* data register */  #define ATA_DATA                        0x00    /* data register */
 #define ATA_ERROR                       0x01    /* (R) error register */  #define ATA_ERROR                       0x01    /* (R) error register */
Line 225  struct ata_channel { Line 229  struct ata_channel {
     TAILQ_HEAD(, ad_request)    ata_queue;      /* head of ATA queue */      TAILQ_HEAD(, ad_request)    ata_queue;      /* head of ATA queue */
     TAILQ_HEAD(, atapi_request) atapi_queue;    /* head of ATAPI queue */      TAILQ_HEAD(, atapi_request) atapi_queue;    /* head of ATAPI queue */
     void                        *running;       /* currently running request */      void                        *running;       /* currently running request */
       struct malloc_pipe          req_mpipe;      /* request allocations */
       struct malloc_pipe          dma_mpipe;      /* dma allocations */
 };  };
   
 /* disk bay/enclosure related */  /* disk bay/enclosure related */
Line 236  struct ata_channel { Line 242  struct ata_channel {
   
 /* externs */  /* externs */
 extern devclass_t ata_devclass;  extern devclass_t ata_devclass;
   extern int      ata_mpipe_size;
     
 /* public prototypes */  /* public prototypes */
 int ata_probe(device_t);  int ata_probe(device_t);
Line 263  int ata_wmode(struct ata_params *); Line 270  int ata_wmode(struct ata_params *);
 int ata_umode(struct ata_params *);  int ata_umode(struct ata_params *);
 int ata_find_dev(device_t, u_int32_t, u_int32_t);  int ata_find_dev(device_t, u_int32_t, u_int32_t);
   
void *ata_dmaalloc(struct ata_channel *, int);void *ata_dmaalloc(struct ata_channel *, int, int);
 void ata_dmafree(struct ata_channel *, void *buf);
 void ata_dmainit(struct ata_channel *, int, int, int, int);  void ata_dmainit(struct ata_channel *, int, int, int, int);
 int ata_dmasetup(struct ata_channel *, int, struct ata_dmaentry *, caddr_t, int);  int ata_dmasetup(struct ata_channel *, int, struct ata_dmaentry *, caddr_t, int);
 void ata_dmastart(struct ata_channel *, int, struct ata_dmaentry *, int);  void ata_dmastart(struct ata_channel *, int, struct ata_dmaentry *, int);

Removed from v.1.3  
changed lines
  Added in v.1.4