Changeset 110 for trunk/src/os2ahci/os2ahci.h

Timestamp:

Jun 21, 2011, 2:39:30 PM (14 years ago)

Author:

Markus Thielen

Message:

contains CMs changes for unaligned buffers; removed unused stack var; let driver continue boot on unknown command line switch

File:

• trunk/src/os2ahci/os2ahci.h (modified) (3 diffs)

trunk/src/os2ahci/os2ahci.h

@@ -281 +281 @@
 typedef struct {
   IORB_QUEUE    iorb_queue;            /* IORB queue for this port */
-  unsigned      dev_max   : 4;         /* maximum device number on this port (0-15) */
-  unsigned      cmd_slot  : 5;         /* current command slot index (using round-
+  unsigned      dev_max     : 4;       /* maximum device number on this port (0-15) */
+  unsigned      cmd_slot    : 5;       /* current command slot index (using round-
                                         * robin indexes to prevent starvation) */
 
@@ -349 +349 @@
   unsigned      is_ncq        : 1;     /* should use native command queueing */
   unsigned      complete      : 1;     /* IORB has completed processing */
+  unsigned      unaligned     : 1;     /* unaligned S/G; need to use transfer buffer */
   unsigned      cmd_slot      : 5;     /* AHCI command slot for this IORB */
 } ADD_WORKSPACE;
+
+/* sg_memcpy() direction */
+typedef enum {
+  SG_TO_BUF,                           /* copy from S/G list to buffer */
+  BUF_TO_SG                            /* copy from buffer to S/G list */
+} SG_MEMCPY_DIRECTION;  
 
 /* -------------------------- function prototypes -------------------------- */
@@ -444 +451 @@
 extern char _far  *strcpy        (char _far *dst, const char _far *src);
 extern int         memcmp        (void _far *p1, void _far *p2, size_t len);
+extern void        sg_memcpy     (SCATGATENTRY _far *sg_list, USHORT sg_cnt,
+                                  ULONG sg_off, void _far *buf, USHORT len,
+                                  SG_MEMCPY_DIRECTION dir);
 extern long        strtol        (const char _far *buf,
                                   const char _far * _far *ep, int base);
 extern void       *malloc        (size_t len);
 extern void        free          (void *ptr);
+extern ULONG       virt_to_phys  (void _far *ptr);
 extern void        mdelay_cal    (void);
 extern void        mdelay        (u32 millies);