ahci: enable by default

[seabios.git] / src / cdrom.c

diff --git a/src/cdrom.c b/src/cdrom.c
index a0fdc50e2ee6d7e7790172a9e334ab463760f187..6351fec0f3ac6fa257989d6b4ba1dfaa957f4b39 100644 (file)
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -17,6 +17,8 @@
  * CD emulation
  ****************************************************************/
 
+struct drive_s *cdemu_drive_gf VAR16VISIBLE;
+
 static int
 cdemu_read(struct disk_op_s *op)
 {
@@ -30,12 +32,12 @@ cdemu_read(struct disk_op_s *op)
 
     int count = op->count;
     op->count = 0;
-    u8 *cdbuf_far = (void*)offsetof(struct extended_bios_data_area_s, cdemu_buf);
+    u8 *cdbuf_fl = GET_GLOBAL(bounce_buf_fl);
 
     if (op->lba & 3) {
         // Partial read of first block.
         dop.count = 1;
-        dop.buf_fl = MAKE_FLATPTR(ebda_seg, cdbuf_far);
+        dop.buf_fl = cdbuf_fl;
         int ret = process_op(&dop);
         if (ret)
             return ret;
@@ -43,10 +45,7 @@ cdemu_read(struct disk_op_s *op)
         if (thiscount > count)
             thiscount = count;
         count -= thiscount;
-        memcpy_far(FLATPTR_TO_SEG(op->buf_fl)
-                   , (void*)FLATPTR_TO_OFFSET(op->buf_fl)
-                   , ebda_seg, cdbuf_far + (op->lba & 3) * 512
-                   , thiscount * 512);
+        memcpy_fl(op->buf_fl, cdbuf_fl + (op->lba & 3) * 512, thiscount * 512);
         op->buf_fl += thiscount * 512;
         op->count += thiscount;
         dop.lba++;
@@ -69,14 +68,12 @@ cdemu_read(struct disk_op_s *op)
     if (count) {
         // Partial read on last block.
         dop.count = 1;
-        dop.buf_fl = MAKE_FLATPTR(ebda_seg, cdbuf_far);
+        dop.buf_fl = cdbuf_fl;
         int ret = process_op(&dop);
         if (ret)
             return ret;
         u8 thiscount = count;
-        memcpy_far(FLATPTR_TO_SEG(op->buf_fl)
-                   , (void*)FLATPTR_TO_OFFSET(op->buf_fl)
-                   , ebda_seg, cdbuf_far, thiscount * 512);
+        memcpy_fl(op->buf_fl, cdbuf_fl, thiscount * 512);
         op->count += thiscount;
     }
 
@@ -106,22 +103,24 @@ process_cdemu_op(struct disk_op_s *op)
     }
 }
 
-struct drive_s *cdemu_drive_gf VAR16VISIBLE;
-
 void
 cdemu_setup(void)
 {
     if (!CONFIG_CDROM_EMU)
         return;
+    if (!CDCount)
+        return;
+    if (bounce_buf_init() < 0)
+        return;
 
     struct drive_s *drive_g = malloc_fseg(sizeof(*drive_g));
-    if (! drive_g) {
+    if (!drive_g) {
         warn_noalloc();
-        cdemu_drive_gf = NULL;
+        free(drive_g);
         return;
     }
-    memset(drive_g, 0, sizeof(*drive_g));
     cdemu_drive_gf = drive_g;
+    memset(drive_g, 0, sizeof(*drive_g));
     drive_g->type = DTYPE_CDEMU;
     drive_g->blksize = DISK_SECTOR_SIZE;
     drive_g->sectors = (u64)-1;
@@ -197,7 +196,7 @@ atapi_is_ready(struct disk_op_s *op)
     int in_progress = 0;
     u64 end = calc_future_tsc(5000);
     for (;;) {
-        if (check_time(end)) {
+        if (check_tsc(end)) {
             dprintf(1, "read capacity failed\n");
             return -1;
         }
@@ -240,12 +239,13 @@ atapi_is_ready(struct disk_op_s *op)
 }
 
 int
-cdrom_boot(int cdid)
+cdrom_boot(struct drive_s *drive_g)
 {
     struct disk_op_s dop;
+    int cdid = getDriveId(EXTTYPE_CD, drive_g);
     memset(&dop, 0, sizeof(dop));
-    dop.drive_g = getDrive(EXTTYPE_CD, cdid);
-    if (!dop.drive_g)
+    dop.drive_g = drive_g;
+    if (!dop.drive_g || cdid < 0)
         return 1;
 
     int ret = atapi_is_ready(&dop);