#include "bregs.h" // struct bregs
#include "biosvar.h" // GET_EBDA
#include "ata.h" // ATA_CMD_REQUEST_SENSE
+#include "blockcmd.h" // CDB_CMD_REQUEST_SENSE
/****************************************************************
struct drive_s *cdemu_drive VAR16VISIBLE;
void
-cdemu_setup()
+cdemu_setup(void)
{
if (!CONFIG_CDROM_EMU)
return;
- struct drive_s *drive_g = allocDrive();
- if (!drive_g) {
+ struct drive_s *drive_g = malloc_fseg(sizeof(*drive_g));
+ if (! drive_g) {
+ warn_noalloc();
cdemu_drive = NULL;
return;
}
- cdemu_drive = ADJUST_GLOBAL_PTR(drive_g);
+ memset(drive_g, 0, sizeof(*drive_g));
+ cdemu_drive = STORE_GLOBAL_PTR(drive_g);
drive_g->type = DTYPE_CDEMU;
drive_g->blksize = DISK_SECTOR_SIZE;
drive_g->sectors = (u64)-1;
if (regs->al == 0x00) {
// FIXME ElTorito Various. Should be handled accordingly to spec
SET_EBDA2(ebda_seg, cdemu.active, 0x00); // bye bye
+
+ // XXX - update floppy/hd count.
}
disk_ret(regs, DISK_RET_SUCCESS);
* CD booting
****************************************************************/
-// Request SENSE
-static int
-atapi_get_sense(struct drive_s *drive_g, u8 *asc, u8 *ascq)
-{
- u8 atacmd[12], buffer[18];
- memset(atacmd, 0, sizeof(atacmd));
- atacmd[0] = ATA_CMD_REQUEST_SENSE;
- atacmd[4] = sizeof(buffer);
- int ret = ata_cmd_packet(drive_g, atacmd, sizeof(atacmd), sizeof(buffer)
- , MAKE_FLATPTR(GET_SEG(SS), buffer));
- if (ret)
- return ret;
-
- *asc = buffer[12];
- *ascq = buffer[13];
-
- return 0;
-}
-
-// Request capacity
static int
-atapi_read_capacity(struct drive_s *drive_g, u32 *blksize, u32 *sectors)
+atapi_is_ready(struct disk_op_s *op)
{
- u8 packet[12], buf[8];
- memset(packet, 0, sizeof(packet));
- packet[0] = 0x25; /* READ CAPACITY */
- int ret = ata_cmd_packet(drive_g, packet, sizeof(packet), sizeof(buf)
- , MAKE_FLATPTR(GET_SEG(SS), buf));
- if (ret)
- return ret;
-
- *blksize = (((u32)buf[4] << 24) | ((u32)buf[5] << 16)
- | ((u32)buf[6] << 8) | ((u32)buf[7] << 0));
- *sectors = (((u32)buf[0] << 24) | ((u32)buf[1] << 16)
- | ((u32)buf[2] << 8) | ((u32)buf[3] << 0));
-
- return 0;
-}
-
-static int
-atapi_is_ready(struct drive_s *drive_g)
-{
- dprintf(6, "atapi_is_ready (drive=%p)\n", drive_g);
+ dprintf(6, "atapi_is_ready (drive=%p)\n", op->drive_g);
/* Retry READ CAPACITY for 5 seconds unless MEDIUM NOT PRESENT is
* reported by the device. If the device reports "IN PROGRESS",
* 30 seconds is added. */
- u32 blksize, sectors;
+ struct cdbres_read_capacity info;
int in_progress = 0;
u64 end = calc_future_tsc(5000);
for (;;) {
- if (rdtscll() > end) {
+ if (check_time(end)) {
dprintf(1, "read capacity failed\n");
return -1;
}
- int ret = atapi_read_capacity(drive_g, &blksize, §ors);
+ int ret = cdb_read_capacity(op, &info);
if (!ret)
// Success
break;
- u8 asc, ascq;
- ret = atapi_get_sense(drive_g, &asc, &ascq);
+ struct cdbres_request_sense sense;
+ ret = cdb_get_sense(op, &sense);
if (ret)
// Error - retry.
continue;
// Sense succeeded.
- if (asc == 0x3a) { /* MEDIUM NOT PRESENT */
+ if (sense.asc == 0x3a) { /* MEDIUM NOT PRESENT */
dprintf(1, "Device reports MEDIUM NOT PRESENT\n");
return -1;
}
- if (asc == 0x04 && ascq == 0x01 && !in_progress) {
+ if (sense.asc == 0x04 && sense.ascq == 0x01 && !in_progress) {
/* IN PROGRESS OF BECOMING READY */
printf("Waiting for device to detect medium... ");
/* Allow 30 seconds more */
}
}
- if (blksize != GET_GLOBAL(drive_g->blksize)) {
+ u32 blksize = ntohl(info.blksize), sectors = ntohl(info.sectors);
+ if (blksize != GET_GLOBAL(op->drive_g->blksize)) {
printf("Unsupported sector size %u\n", blksize);
return -1;
}
int
cdrom_boot(int cdid)
{
- struct drive_s *drive_g = getDrive(EXTTYPE_CD, cdid);
- if (!drive_g)
+ struct disk_op_s dop;
+ memset(&dop, 0, sizeof(dop));
+ dop.drive_g = getDrive(EXTTYPE_CD, cdid);
+ if (!dop.drive_g)
return 1;
- int ret = atapi_is_ready(drive_g);
+ int ret = atapi_is_ready(&dop);
if (ret)
dprintf(1, "atapi_is_ready returned %d\n", ret);
// Read the Boot Record Volume Descriptor
u8 buffer[2048];
- struct disk_op_s dop;
- memset(&dop, 0, sizeof(dop));
- dop.drive_g = drive_g;
dop.lba = 0x11;
dop.count = 1;
dop.buf_fl = MAKE_FLATPTR(GET_SEG(SS), buffer);
- ret = cdrom_read(&dop);
+ ret = cdb_read(&dop);
if (ret)
return 3;
// And we read the Boot Catalog
dop.lba = lba;
- ret = cdrom_read(&dop);
+ dop.count = 1;
+ ret = cdb_read(&dop);
if (ret)
return 7;
u8 media = buffer[0x21];
SET_EBDA2(ebda_seg, cdemu.media, media);
- SET_EBDA2(ebda_seg, cdemu.emulated_drive, ADJUST_GLOBAL_PTR(drive_g));
+ SET_EBDA2(ebda_seg, cdemu.emulated_drive, STORE_GLOBAL_PTR(dop.drive_g));
u16 boot_segment = *(u16*)&buffer[0x22];
if (!boot_segment)
dop.lba = lba;
dop.count = DIV_ROUND_UP(nbsectors, 4);
dop.buf_fl = MAKE_FLATPTR(boot_segment, 0);
- ret = cdrom_read(&dop);
+ ret = cdb_read(&dop);
if (ret)
return 12;
if (media < 4) {
// Floppy emulation
SET_EBDA2(ebda_seg, cdemu.emulated_extdrive, 0x00);
+ // XXX - get and set actual floppy count.
SETBITS_BDA(equipment_list_flags, 0x41);
switch (media) {
projects / seabios.git / blobdiff