Changeset ebb1489 in mainline for uspace/lib/ata/include/ata/ata_hw.h

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/lib/ata/include/ata/ata_hw.h (moved) (moved from uspace/drv/block/ata_bd/ata_hw.h ) (6 diffs)

uspace/lib/ata/include/ata/ata_hw.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ata_bd
+/** @addtogroup libata
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef __ATA_HW_H__
-#define __ATA_HW_H__
-
+#ifndef LIBATA_ATA_HW_H
+#define LIBATA_ATA_HW_H
+
+#include <stddef.h>
 #include <stdint.h>
 
@@ -48 +49 @@
 
 enum {
-        MAX_DISKS       = 2
+        MAX_DEVICES     = 2
 };
 
@@ -96 +97 @@
         };
 } ata_ctl_t;
+
+#define REG_SECTOR_COUNT offsetof(ata_cmd_t, sector_count)
+#define REG_SECTOR_NUMBER offsetof(ata_cmd_t, sector_number)
+#define REG_CYLINDER_LOW offsetof(ata_cmd_t, cylinder_low)
+#define REG_CYLINDER_HIGH offsetof(ata_cmd_t, cylinder_high)
+#define REG_DRIVE_HEAD offsetof(ata_cmd_t, drive_head)
+#define REG_STATUS offsetof(ata_cmd_t, status)
+#define REG_COMMAND offsetof(ata_cmd_t, command)
+#define REG_FEATURES offsetof(ata_cmd_t, features)
 
 enum devctl_bits {
@@ -132 +142 @@
         CMD_READ_SECTORS        = 0x20,
         CMD_READ_SECTORS_EXT    = 0x24,
+        CMD_READ_DMA_EXT        = 0x25,
         CMD_WRITE_SECTORS       = 0x30,
         CMD_WRITE_SECTORS_EXT   = 0x34,
+        CMD_WRITE_DMA_EXT       = 0x35,
         CMD_PACKET              = 0xA0,
         CMD_IDENTIFY_PKT_DEV    = 0xA1,
+        CMD_READ_DMA            = 0xC8,
+        CMD_WRITE_DMA           = 0xCA,
         CMD_IDENTIFY_DRIVE      = 0xEC,
         CMD_FLUSH_CACHE         = 0xE7