2 files changed, 13 insertions, 0 deletions
diff --git a/sys/include/dev/ic/ahciregs.h b/sys/include/dev/ic/ahciregs.h
index f959a1e..232b41e 100644
--- a/sys/include/dev/ic/ahciregs.h
+++ b/sys/include/dev/ic/ahciregs.h
@@ -88,6 +88,7 @@ struct hba_memspace {
  */
 #define AHCI_PXSSTS_DET(SSTS) (SSTS & 0xF)
 #define AHCI_PXSSTS_IPM(SSTS) ((SSTS >> 8) & 0xF)
+#define AHCI_PXSSTS_SPD(SSTS) ((SSTS >> 4) & 0xF)
 
 /*
  * Port SATA control bits
@@ -100,6 +101,7 @@ struct hba_memspace {
  * See section 3.3.7 of the AHCI spec.
  */
 #define AHCI_PXCMD_ST   BIT(0)    /* Start */
+#define AHCI_PXCMD_SUD  BIT(1)    /* Spin-up device */
 #define AHCI_PXCMD_FRE  BIT(4)    /* FIS Receive Enable */
 #define AHCI_PXCMD_FR   BIT(14)   /* FIS Receive Running  */
 #define AHCI_PXCMD_CR   BIT(15)   /* Command List Running */
@@ -137,6 +139,9 @@ struct hba_memspace {
 #define AHCI_DET_PRESENT    1   /* Device present (no PHY comm) */
 #define AHCI_DET_COMM       3   /* Device present and phy comm established */
 #define AHCI_IPM_ACTIVE     1
+#define AHCI_SPD_GEN1       1   /* 1.5 Gb/s */
+#define AHCI_SPD_GEN2       2   /* 3 Gb/s */
+#define AHCI_SPD_GEN3       3   /* 6 Gb/s */
 
 /*
  * PxSERR bits
@@ -158,6 +163,8 @@ struct hba_memspace {
 #define AHCI_DIAG_T BIT(24) /* Transport state transition error */
 #define AHCI_DIAG_F BIT(25) /* Unknown FIS type */
 
+#define ATAPI_SIG 0xEB140101
+
 /*
  * Device detection initialization values
  * See section 3.3.11 of the AHCI spec.
diff --git a/sys/include/dev/ic/ahcivar.h b/sys/include/dev/ic/ahcivar.h
index fa24812..67f2efe 100644
--- a/sys/include/dev/ic/ahcivar.h
+++ b/sys/include/dev/ic/ahcivar.h
@@ -33,9 +33,12 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
+#include <dev/dcdr/cache.h>
 #include <dev/ic/ahciregs.h>
 #include <fs/ctlfs.h>
 
+#define AHCI_DCDR_CAP 16
+
 struct ahci_cmd_hdr;
 extern const struct ctlops g_sata_bsize_ops;
 
@@ -93,6 +96,7 @@ struct ahci_hba {
  * @io: Memory mapped port registers
  * @hba: HBA descriptor
  * @cmdlist: Command list [p]
+ * @nlba: Max number of addressable blocks
  * @fra: FIS receive area [p]
  * @dev: Device minor number.
  */
@@ -100,6 +104,8 @@ struct hba_device {
     struct hba_port *io;
     struct ahci_hba *hba;
     struct ahci_cmd_hdr *cmdlist;
+    struct dcdr *dcdr;
+    uint32_t nlba;
     void *fra;
     dev_t dev;
 };