#include "memmap.h" // add_e820
#include "biosvar.h" // GET_GLOBAL
#include "bregs.h" // struct bregs
-
-#define RAMDISK_SECTOR_SIZE 512
+#include "boot.h" // boot_add_floppy
void
-ramdisk_setup()
+ramdisk_setup(void)
{
- if (!CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
return;
// Find image.
- int iscomp;
- struct cbfs_file *file = cbfs_finddataprefix("floppyimg/", NULL, &iscomp);
+ struct cbfs_file *file = cbfs_findprefix("floppyimg/", NULL);
if (!file)
return;
- u32 size = cbfs_datasize(file, iscomp);
- dprintf(3, "Found floppy file %s of size %d\n", cbfs_filename(file), size);
+ const char *filename = cbfs_filename(file);
+ u32 size = cbfs_datasize(file);
+ dprintf(3, "Found floppy file %s of size %d\n", filename, size);
int ftype = find_floppy_type(size);
if (ftype < 0) {
dprintf(3, "No floppy type found for ramdisk size\n");
}
// Allocate ram for image.
- struct e820entry *e = find_high_area(size);
- if (!e) {
- dprintf(3, "No ram for ramdisk\n");
+ void *pos = memalign_tmphigh(PAGE_SIZE, size);
+ if (!pos) {
+ warn_noalloc();
return;
}
- u32 loc = e->start + e->size - size;
- add_e820(loc, size, E820_RESERVED);
+ add_e820((u32)pos, size, E820_RESERVED);
// Copy image into ram.
- cbfs_copyfile(file, (void*)loc, size, iscomp);
+ cbfs_copyfile(file, pos, size);
// Setup driver.
- dprintf(1, "Mapping CBFS floppy %s to addr %x\n", cbfs_filename(file), loc);
- addFloppy(loc, ftype, DTYPE_RAMDISK);
+ struct drive_s *drive_g = init_floppy((u32)pos, ftype);
+ if (!drive_g)
+ return;
+ drive_g->type = DTYPE_RAMDISK;
+ dprintf(1, "Mapping CBFS floppy %s to addr %p\n", filename, pos);
+ char *desc = znprintf(MAXDESCSIZE, "Ramdisk [%s]", &filename[10]);
+ boot_add_floppy(drive_g, desc, bootprio_find_named_rom(filename, 0));
}
static int
-ramdisk_op(struct disk_op_s *op, int iswrite)
+ramdisk_copy(struct disk_op_s *op, int iswrite)
{
- u32 offset = GET_GLOBAL(Drives.drives[op->driveid].cntl_id);
- offset += (u32)op->lba * RAMDISK_SECTOR_SIZE;
+ u32 offset = GET_GLOBAL(op->drive_g->cntl_id);
+ offset += (u32)op->lba * DISK_SECTOR_SIZE;
u64 opd = GDT_DATA | GDT_LIMIT(0xfffff) | GDT_BASE((u32)op->buf_fl);
u64 ramd = GDT_DATA | GDT_LIMIT(0xfffff) | GDT_BASE(offset);
gdt[3] = opd;
}
- // Call 0x1587 to copy data.
+ // Call int 1587 to copy data.
struct bregs br;
memset(&br, 0, sizeof(br));
+ br.flags = F_CF|F_IF;
br.ah = 0x87;
br.es = GET_SEG(SS);
br.si = (u32)gdt;
- br.cx = op->count * RAMDISK_SECTOR_SIZE / 2;
+ br.cx = op->count * DISK_SECTOR_SIZE / 2;
call16_int(0x15, &br);
+ if (br.flags & F_CF)
+ return DISK_RET_EBADTRACK;
return DISK_RET_SUCCESS;
}
int
process_ramdisk_op(struct disk_op_s *op)
{
- if (!CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
+ if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !CONFIG_FLASH_FLOPPY)
return 0;
switch (op->command) {
case CMD_READ:
- return ramdisk_op(op, 0);
+ return ramdisk_copy(op, 0);
case CMD_WRITE:
- return ramdisk_op(op, 1);
+ return ramdisk_copy(op, 1);
case CMD_VERIFY:
case CMD_FORMAT:
case CMD_RESET: