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

Timestamp:

Mar 27, 2013, 5:55:26 AM (12 years ago)

Author:

David Azarewicz

Message:

Fix spin-up / power-up issue on some hardware
Changes to debug output
Fixup makefiles

File:

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

trunk/src/os2ahci/os2ahci.h

@@ -157 +157 @@
 #define DevHelp_FreeSpinLock(sph)      0
 
-#define DevHelp_AquireSpinLock(sph)    if ((sph) != 0)                \
+#define DevHelp_AcquireSpinLock(sph)    if ((sph) != 0)                \
                                          panic("recursive spinlock"); \
                                        (sph) = disable()
@@ -168 +168 @@
 
 /* shortcut macros */
-#define spin_lock(sl)     DevHelp_AquireSpinLock(sl)
+#define spin_lock(sl)     DevHelp_AcquireSpinLock(sl)
 #define spin_unlock(sl)   DevHelp_ReleaseSpinLock(sl)
 
@@ -476 +476 @@
 extern void        vfprintf      (const char *fmt, va_list va);
 extern void _cdecl printf        (const char *fmt, ...);
+extern void _cdecl printf_nts    (const char *fmt, ...);
 extern void        cprintf       (const char *fmt, ...);
 extern void        phex          (const void _far *p, int len, const char *fmt, ...);
@@ -500 +501 @@
 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_read    (u8 _far *buf, u16 cb_buf);
+//NOT_USED extern u16         trace_bytes_avail(void);
 extern u16         trace_char_dev(RP_RWV _far *rwrb);
 
@@ -511 +512 @@
 extern char     *vendor_from_id (u16 vendor);
 extern char     *device_from_id (u16 device);
+UCHAR pci_read_conf    (UCHAR bus, UCHAR dev_func, UCHAR indx,
+                        UCHAR size, ULONG _far *val);
+UCHAR pci_write_conf   (UCHAR bus, UCHAR dev_func, UCHAR indx, UCHAR size,
+                        ULONG val);
 
 /* ctxhook.c */