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

Timestamp:

Feb 22, 2011, 2:25:44 AM (14 years ago)

Author:

chris

Message:

• Further fixes to automatic ATAPI sense handling, now supporting sense buffers larger than 64 bytes if requested by initiator (cdrecord wanted 96 bytes)
• Separate, and internally handled, spinlock for libc malloc/free calls to reduce chances of memory corruption if somebody forgets to get the driver-level spinlock before calling malloc/free. There was no real problem with that, just some awkward code fragments which look much better now.
• Link power management implemented
• More generic support for adapter/port options so all of them can now have a global, adapter or port scope
• Generic support for inverting driver options (i.e. turn them off with '!')
• Thorough PCI scan is now the default; the reason it wasn't so far was a delay in Virtualbox but that was never a problem on real hardware
• SCSI emulation for ATAPI devices; this can be enabled on global, adapter or port scope

File:

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

trunk/src/os2ahci/os2ahci.h

@@ -115 +115 @@
 /* ctype macros */
 #define isupper(ch)           ((ch) >= 'A' && (ch) <= 'Z')
-#define tolower(ch)           (isupper(ch) ? (ch) - ('a' - 'A') : (ch))
+#define tolower(ch)           (isupper(ch) ? (ch) + ('a' - 'A') : (ch))
 
 /* stddef macros */
@@ -192 +192 @@
 #define add_workspace(iorb)     ((ADD_WORKSPACE _far *) &(iorb)->ADDWorkSpace)
 
-/* free resources in ADD workspace (timer, buffer, ...) */
-#define aws_free(aws)           if ((aws)->timer != 0) {               \
-                                  ADD_CancelTimer((aws)->timer);       \
-                                  (aws)->timer = 0;                    \
-                                }                                      \
-                                if ((aws)->buf != NULL) {              \
-                                  free((aws)->buf);                    \
-                                  (aws)->buf = NULL;                   \
-                                }
-
-/* complete IORB */
-#define complete_iorb(iorb)   (iorb)->Status |= IORB_DONE;                    \
-                              dprintf("IORB %Fp complete "                    \
-                                      "(status = 0x%04x, error = 0x%04x)\n",  \
-                                      (iorb), (iorb)->Status,                 \
-                                      (iorb)->ErrorCode);                     \
-                              if ((iorb)->RequestControl & IORB_ASYNC_POST) { \
-                                (iorb)->NotifyAddress(iorb);                  \
-                              }
 
 
@@ -264 +245 @@
 #define ANSI_CLR_WHITE  "\x1b[37m"
 #define ANSI_RESET      "\x1b[0m"
-
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -397 +377 @@
 extern void    iorb_seterr            (IORBH _far *iorb, USHORT error_code);
 extern void    iorb_done              (IORBH _far *iorb);
+extern void    iorb_complete          (IORBH _far *iorb);
 extern void    iorb_requeue           (IORBH _far *iorb);
+extern void    aws_free               (ADD_WORKSPACE _far *aws);
 extern void    lock_adapter           (AD_INFO *ai);
 extern void    unlock_adapter         (AD_INFO *ai);
@@ -443 +425 @@
 
 /* libc.c */
-extern void        init_com1     (void);
+extern void        init_libc     (void);
+extern void        init_com      (void);
 extern int         vsprintf      (char _far *buf, const char *fmt, va_list va);
 extern int         sprintf       (char _far *buf, const char *fmt, ...);
@@ -523 +506 @@
 
 /* apapter/port-specific options saved when parsing the command line */
+extern u8            emulate_scsi[MAX_AD][AHCI_MAX_PORTS];
+extern u8            disable_ncq[MAX_AD][AHCI_MAX_PORTS];
 extern u8            link_speed[MAX_AD][AHCI_MAX_PORTS];
-extern u8            disable_ncq[MAX_AD][AHCI_MAX_PORTS];
-
+extern u8            link_power[MAX_AD][AHCI_MAX_PORTS];
+