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

Timestamp:

Jul 6, 2011, 10:02:47 AM (14 years ago)

Author:

Markus Thielen

Message:

• removed RAS calls (tracing to OS/2 kernel trace buffer was unreliable)
• added private trace ring buffer implementation
• support read from OS2AHCI$ character device
• contents of trace ring buffer are accesible via OS2AHCI$ character device
• updated WATCOM makefile; WATCOM build still produces a non-working driver
• code cleanup (unused variables etc.)

File:

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

trunk/src/os2ahci/os2ahci.h

@@ -94 +94 @@
 #define dddprintf if (debug > 2) printf
 #define dddphex   if (debug > 2) phex
+
+/* TRACE macros (for our internal ring buffer trace) */
+#define TRACE_ACTIVE  (debug > 0 && com_base == 0)
 
 /* adapter number from AD_INFO pointer; mainly for dprintf() purposes */
@@ -251 +254 @@
 #define ANSI_RESET      "\x1b[0m"
 
-/******************************************************************************
- * trace constants
- */
-#define AHCI_TRACE_MAJOR 0x00faU
-#define TRACE_MINOR_ATA_IDENTIFY  0x0020
-#define TRACE_MINOR_EXEC_CDB      0x0021
-#define TRACE_MINOR_EXEC_ATA      0x0022
-#define TRACE_MINOR_ATA_CMD       0x0023
-#define TRACE_MINOR_ATAPI_CMD     0x0024
-#define TRACE_MINOR_SG_LIST       0x0025
-#define TRACE_MINOR_SENSE_BUF     0x0026
-#define TRACE_MINOR_OEMHLP_PARM   0x0027
-#define TRACE_MINOR_OEMHLP_DATA   0x0028
-#define TRACE_MINOR_CMD_HDR       0x0029
-
-
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -390 +377 @@
 extern USHORT  init_drv               (RPINITIN _far *req);
 extern USHORT  gen_ioctl              (RP_GENIOCTL _far *ioctl);
+extern USHORT  char_dev_input         (RP_RWV _far *rwrb);
 extern USHORT  exit_drv               (int func);
 extern void _cdecl _far _loadds add_entry    (IORBH _far *iorb);
@@ -463 +451 @@
 extern void _cdecl printf        (const char *fmt, ...);
 extern void        cprintf       (const char *fmt, ...);
-extern void        phex          (const void _far *p, int len,
-                                  u16 trace_minor_code, const char *fmt, ...);
+extern void        phex          (const void _far *p, int len, const char *fmt, ...);
 extern size_t      strlen        (const char _far *s);
 extern char _far  *strcpy        (char _far *dst, const char _far *src);
@@ -482 +469 @@
 extern int         disable       (void);
 extern void        enable        (void);
-extern void        trace         (u16 minor_code, u16 cb_buf, 
-                                  const char _far *buf);
+
+/* trace.c */
+extern void        trace_init    (void);
+extern void        trace_exit    (void);
+extern void        trace_write   (u8 _far *s, int len);
+extern u16         trace_read    (void _far *buf, u16 cb_buf);
+extern u16         trace_bytes_avail(void);
+extern u16         trace_char_dev(RP_RWV _far *rwrb);
 
 /* pci.c */
@@ -524 +517 @@
 extern PCI_ID        pci_ids[];     /* SATA adapter PCI IDs */
 extern ULONG         drv_lock;      /* driver-level spinlock */
+extern ULONG         com_lock;      /* debug log spinlock */
 extern IORB_QUEUE    driver_queue;  /* driver-level IORB queue */
 extern AD_INFO       ad_infos[];    /* adapter information list */