Changes in / [e5792d1:a71c158] in mainline

Location:

uspace/srv/bd/ata_bd

Files:

• ata_bd.c (modified) (11 diffs)
• ata_bd.h (modified) (3 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -50 +50 @@
 #include <as.h>
 #include <fibril_sync.h>
-#include <string.h>
 #include <devmap.h>
 #include <sys/types.h>
@@ -86 +85 @@
 static int ata_bd_write_block(int disk_id, uint64_t blk_idx, size_t blk_cnt,
     const void *buf);
-static int disk_init(disk_t *d, int disk_id);
-static int drive_identify(int drive_id, void *buf);
-static void disk_print_summary(disk_t *d);
+static int drive_identify(int drive_id, disk_t *d);
 static int wait_status(unsigned set, unsigned n_reset, uint8_t *pstatus,
     unsigned timeout);
@@ -109 +106 @@
                 fflush(stdout);
 
-                rc = disk_init(&disk[i], i);
+                rc = drive_identify(i, &disk[i]);
 
                 if (rc == EOK) {
-                        disk_print_summary(&disk[i]);
+                        printf("%u cylinders, %u heads, %u sectors\n",
+                            disk[i].cylinders, disk[i].heads, disk[i].sectors);
                 } else {
                         printf("Not found.\n");
@@ -149 +147 @@
 }
 
-/** Print one-line device summary. */
-static void disk_print_summary(disk_t *d)
-{
-        uint64_t mbytes;
-
-        printf("%s: ", d->model);
-
-        if (d->amode == am_chs) {
-                printf("CHS %u cylinders, %u heads, %u sectors",
-                    disk->geom.cylinders, disk->geom.heads, disk->geom.sectors);
-        } else {
-                printf("LBA-28");
-        }
-
-        printf(" %llu blocks", d->blocks, d->blocks / (2 * 1024));
-
-        mbytes = d->blocks / (2 * 1024);
-        if (mbytes > 0)
-                printf(" %llu MB.", mbytes);
-
-        printf("\n");
-}
 
 /** Register driver and enable device I/O. */
@@ -275 +251 @@
 }
 
-/** Initialize a disk.
- *
- * Probes for a disk, determines its parameters and initializes
- * the disk structure.
- */
-static int disk_init(disk_t *d, int disk_id)
-{
-        identify_data_t idata;
-        uint8_t model[40];
-        uint16_t w;
-        uint8_t c;
-        size_t pos, len;
-        int rc;
-        int i;
-
-        rc = drive_identify(disk_id, &idata);
-        if (rc != EOK) {
-                d->present = false;
-                return rc;
-        }
-
-        if ((idata.caps & cap_lba) == 0) {
-                /* Device only supports CHS addressing. */
-                d->amode = am_chs;
-
-                d->geom.cylinders = idata.cylinders;
-                d->geom.heads = idata.heads;
-                d->geom.sectors = idata.sectors;
-
-                d->blocks = d->geom.cylinders * d->geom.heads * d->geom.sectors;
-        } else {
-                /* Device supports LBA-28. */
-                d->amode = am_lba28;
-
-                d->geom.cylinders = 0;
-                d->geom.heads = 0;
-                d->geom.sectors = 0;
-
-                d->blocks =
-                    (uint32_t) idata.total_lba_sec0 | 
-                    ((uint32_t) idata.total_lba_sec1 << 16);
-        }
-
-        /*
-         * Convert model name to string representation.
-         */
-        for (i = 0; i < 20; i++) {
-                w = idata.model_name[i];
-                model[2 * i] = w >> 8;
-                model[2 * i + 1] = w & 0x00ff;
-        }
-
-        len = 40;
-        while (len > 0 && model[len - 1] == 0x20)
-                --len;
-
-        pos = 0;
-        for (i = 0; i < len; ++i) {
-                c = model[i];
-                if (c >= 0x80) c = '?';
-
-                chr_encode(c, d->model, &pos, 40);
-        }
-        d->model[pos] = '\0';
-
-        d->present = true;
-        fibril_mutex_initialize(&d->lock);
-
-        return EOK;
-}
-
 /** Transfer a logical block from/to the device.
  *
@@ -389 +294 @@
 /** Issue IDENTIFY command.
  *
- * Reads @c identify data into the provided buffer. This is used to detect
- * whether an ATA device is present and if so, to determine its parameters.
+ * This is used to detect whether an ATA device is present and if so,
+ * to determine its parameters. The parameters are written to @a d.
  *
  * @param disk_id       Device ID, 0 or 1.
- * @param buf           Pointer to a 512-byte buffer.
- */
-static int drive_identify(int disk_id, void *buf)
+ * @param d             Device structure to store parameters in.
+ */
+static int drive_identify(int disk_id, disk_t *d)
 {
         uint16_t data;
@@ -403 +308 @@
 
         drv_head = ((disk_id != 0) ? DHR_DRV : 0);
+        d->present = false;
 
         if (wait_status(0, ~SR_BSY, NULL, TIMEOUT_PROBE) != EOK)
@@ -424 +330 @@
 
         if ((status & SR_DRQ) != 0) {
+//              for (i = 0; i < block_size / 2; i++) {
+//                      data = pio_read_16(&cmd->data_port);
+//                      ((uint16_t *) buf)[i] = data;
+//              }
+
                 for (i = 0; i < block_size / 2; i++) {
                         data = pio_read_16(&cmd->data_port);
-                        ((uint16_t *) buf)[i] = data;
+
+                        switch (i) {
+                        case 1: d->cylinders = data; break;
+                        case 3: d->heads = data; break;
+                        case 6: d->sectors = data; break;
+                        }
                 }
         }
@@ -432 +348 @@
         if ((status & SR_ERR) != 0)
                 return EIO;
+
+        d->blocks = d->cylinders * d->heads * d->sectors;
+
+        d->present = true;
+        fibril_mutex_initialize(&d->lock);
 
         return EOK;
@@ -462 +383 @@
                 return EINVAL;
 
-        if (d->amode == am_chs) {
-                /* Compute CHS coordinates. */
-                c = blk_idx / (d->geom.heads * d->geom.sectors);
-                idx = blk_idx % (d->geom.heads * d->geom.sectors);
-
-                h = idx / d->geom.sectors;
-                s = 1 + (idx % d->geom.sectors);
-        } else {
-                /* Compute LBA-28 coordinates. */
-                s = blk_idx & 0xff;             /* bits 0-7 */
-                c = (blk_idx >> 8) & 0xffff;    /* bits 8-23 */
-                h = (blk_idx >> 24) & 0x0f;     /* bits 24-27 */
-        }
+        /* Compute CHS. */
+        c = blk_idx / (d->heads * d->sectors);
+        idx = blk_idx % (d->heads * d->sectors);
+
+        h = idx / d->sectors;
+        s = 1 + (idx % d->sectors);
 
         /* New value for Drive/Head register */
         drv_head =
             ((disk_id != 0) ? DHR_DRV : 0) |
-            ((d->amode != am_chs) ? DHR_LBA : 0) |
             (h & 0x0f);
 
@@ -551 +464 @@
                 return EINVAL;
 
-        if (d->amode == am_chs) {
-                /* Compute CHS coordinates. */
-                c = blk_idx / (d->geom.heads * d->geom.sectors);
-                idx = blk_idx % (d->geom.heads * d->geom.sectors);
-
-                h = idx / d->geom.sectors;
-                s = 1 + (idx % d->geom.sectors);
-        } else {
-                /* Compute LBA-28 coordinates. */
-                s = blk_idx & 0xff;             /* bits 0-7 */
-                c = (blk_idx >> 8) & 0xffff;    /* bits 8-23 */
-                h = (blk_idx >> 24) & 0x0f;     /* bits 24-27 */
-        }
+        /* Compute CHS. */
+        c = blk_idx / (d->heads * d->sectors);
+        idx = blk_idx % (d->heads * d->sectors);
+
+        h = idx / d->sectors;
+        s = 1 + (idx % d->sectors);
 
         /* New value for Drive/Head register */
         drv_head =
             ((disk_id != 0) ? DHR_DRV : 0) |
-            ((d->amode != am_chs) ? DHR_LBA : 0) |
             (h & 0x0f);
 

uspace/srv/bd/ata_bd/ata_bd.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <fibril_sync.h>
-#include <string.h>
 
 enum {
@@ -116 +115 @@
 
 enum drive_head_bits {
-        DHR_LBA         = 0x40, /**< Use LBA addressing mode */
-        DHR_DRV         = 0x10  /**< Select device 1 */
+        DHR_DRV         = 0x10
 };
 
@@ -144 +142 @@
 };
 
-/** Data returned from @c identify command. */
-typedef struct {
-        uint16_t gen_conf;
-        uint16_t cylinders;
-        uint16_t _res2;
-        uint16_t heads;
-        uint16_t _vs4;
-        uint16_t _vs5;
-        uint16_t sectors;
-        uint16_t _vs7;
-        uint16_t _vs8;
-        uint16_t _vs9;
-        uint16_t serial_number[10];
-        uint16_t _vs20;
-        uint16_t _vs21;
-        uint16_t vs_bytes;
-        uint16_t firmware_rev[4];
-        uint16_t model_name[20];
-        uint16_t max_rw_multiple;
-        uint16_t _res48;
-        uint16_t caps;
-        uint16_t _res50;
-        uint16_t pio_timing;
-        uint16_t dma_timing;
-        uint16_t validity;
-        uint16_t cur_cyl;
-        uint16_t cur_heads;
-        uint16_t cur_sectors;
-        uint16_t cur_capacity0;
-        uint16_t cur_capacity1;
-        uint16_t mss;
-        uint16_t total_lba_sec0;
-        uint16_t total_lba_sec1;
-        uint16_t sw_dma;
-        uint16_t mw_dma;
-        uint16_t pio_modes;
-        uint16_t min_mw_dma_cycle;
-        uint16_t rec_mw_dma_cycle;
-        uint16_t min_raw_pio_cycle;
-        uint16_t min_iordy_pio_cycle;
-        uint16_t _res69;
-        uint16_t _res70;
-        uint16_t _res71[1 + 127 - 71];
-        uint16_t _vs128[1 + 159 - 128];
-        uint16_t _res160[1 + 255 - 160];
-} identify_data_t;
-
-enum ata_caps {
-        cap_iordy       = 0x0800,
-        cap_iordy_cbd   = 0x0400,
-        cap_lba         = 0x0200,
-        cap_dma         = 0x0100
-};
-
-/** Block addressing mode. */
-enum addr_mode {
-        am_chs,
-        am_lba28
-};
-
 typedef struct {
         bool present;
-        enum addr_mode amode;
-
-        /*
-         * Geometry. Only valid if operating in CHS mode.
-         */
-        struct {
-                unsigned heads;
-                unsigned cylinders;
-                unsigned sectors;
-        } geom;
-
+        unsigned heads;
+        unsigned cylinders;
+        unsigned sectors;
         uint64_t blocks;
-
-        char model[STR_BOUNDS(40) + 1];
 
         fibril_mutex_t lock;