diff options
| author | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2013-07-09 11:55:56 +0000 |
|---|---|---|
| committer | Jonathan Matthew <jmatthew@cvs.openbsd.org> | 2013-07-09 11:55:56 +0000 |
| commit | 6cc5b844e0d5ffd91320fbe062884d8946b33175 (patch) | |
| tree | 91606a75d8178f1c4bf129007e2ff0a93d4be6d9 /sys/dev | |
| parent | 8bfb1cc55df25579f593ecd859f06c9c4fc0b7b8 (diff) | |
move AHCI_DEBUG stuff into ahci.c so we can build with it enabled again
ok dlg@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/ahci.c | 16 | ||||
| -rw-r--r-- | sys/dev/ic/ahcivar.h | 14 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c index 5033c9c554c..69d52183931 100644 --- a/sys/dev/ic/ahci.c +++ b/sys/dev/ic/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.1 2013/01/21 11:17:48 patrick Exp $ */ +/* $OpenBSD: ahci.c,v 1.2 2013/07/09 11:55:55 jmatthew Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -43,6 +43,20 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> + +#ifdef AHCI_DEBUG +#define DPRINTF(m, f...) do { if ((ahcidebug & (m)) == (m)) printf(f); } \ + while (0) +#define AHCI_D_TIMEOUT 0x00 +#define AHCI_D_VERBOSE 0x01 +#define AHCI_D_INTR 0x02 +#define AHCI_D_XFER 0x08 +int ahcidebug = AHCI_D_VERBOSE; +#else +#define DPRINTF(m, f...) +#endif + + void ahci_hibernate_io_start(struct ahci_port *, struct ahci_ccb *); int ahci_hibernate_io_poll(struct ahci_port *, diff --git a/sys/dev/ic/ahcivar.h b/sys/dev/ic/ahcivar.h index cdda7a19842..ec358ead7e5 100644 --- a/sys/dev/ic/ahcivar.h +++ b/sys/dev/ic/ahcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ahcivar.h,v 1.1 2013/01/21 11:17:48 patrick Exp $ */ +/* $OpenBSD: ahcivar.h,v 1.2 2013/07/09 11:55:55 jmatthew Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -25,18 +25,6 @@ /* change to AHCI_DEBUG for dmesg spam */ #define NO_AHCI_DEBUG -#ifdef AHCI_DEBUG -#define DPRINTF(m, f...) do { if ((ahcidebug & (m)) == (m)) printf(f); } \ - while (0) -#define AHCI_D_TIMEOUT 0x00 -#define AHCI_D_VERBOSE 0x01 -#define AHCI_D_INTR 0x02 -#define AHCI_D_XFER 0x08 -int ahcidebug = AHCI_D_VERBOSE; -#else -#define DPRINTF(m, f...) -#endif - struct ahci_cmd_hdr { u_int16_t flags; #define AHCI_CMD_LIST_FLAG_CFL 0x001f /* Command FIS Length */ |