#include <devices/ide.h>
+
+#ifndef DEBUG_IDE
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
struct hd_state {
addr_t disk_image;
uint32_t capacity; // in bytes
};
-// HDs always read 2048 byte blocks... ?
-static int hd_read(uint8_t * buf, int count, int lba, void * private_data) {
+// HDs always read 512 byte blocks... ?
+static int hd_read(uint8_t * buf, int sector_count, uint64_t lba, void * private_data) {
struct vm_device * hd_dev = (struct vm_device *)private_data;
struct hd_state * hd = (struct hd_state *)(hd_dev->private_data);
int offset = lba * IDE_SECTOR_SIZE;
- int length = ((offset + count) > hd->capacity) ? (hd->capacity - offset) : count;
+ int length = sector_count * IDE_SECTOR_SIZE;
- PrintDebug("Reading RAM HD at (LBA=%d) offset %d (length=%d)\n", lba, offset, length);
+ // PrintDebug("Reading RAM HD at (LBA=%d) offset %d (length=%d)\n", (uint32_t)lba, offset, length);
memcpy(buf, (uint8_t *)(hd->disk_image + offset), length);
- // Pad out the rest of the buffer with 0's
- // memset(buf + length, 0, IDE_SECTOR_SIZE - length);
+ return 0;
+}
+
+
+static int hd_write(uint8_t * buf, int sector_count, uint64_t lba, void * private_data) {
+ struct vm_device * hd_dev = (struct vm_device *)private_data;
+ struct hd_state * hd = (struct hd_state *)(hd_dev->private_data);
+ int offset = lba * IDE_SECTOR_SIZE;
+ int length = sector_count * IDE_SECTOR_SIZE;
+
+ memcpy((uint8_t *)(hd->disk_image + offset), buf, length);
return 0;
}
-static uint32_t hd_get_capacity(void * private_data) {
+static uint64_t hd_get_capacity(void * private_data) {
struct vm_device * hd_dev = (struct vm_device *)private_data;
struct hd_state * hd = (struct hd_state *)(hd_dev->private_data);
PrintDebug("Querying RAM HD capacity (bytes=%d) (ret = %d)\n",
- hd->capacity, (hd->capacity + IDE_SECTOR_SIZE - 1) / IDE_SECTOR_SIZE);
- return (hd->capacity + IDE_SECTOR_SIZE - 1) / IDE_SECTOR_SIZE;
+ hd->capacity, hd->capacity / IDE_SECTOR_SIZE);
+ return hd->capacity / IDE_SECTOR_SIZE;
}
static struct v3_ide_hd_ops hd_ops = {
.read = hd_read,
+ .write = hd_write,
.get_capacity = hd_get_capacity,
};
struct vm_device * v3_create_ram_hd(struct vm_device * ide,
uint_t bus, uint_t drive,
addr_t ramdisk, uint32_t size) {
- struct hd_state * hd = (struct hd_state *)V3_Malloc(sizeof(struct hd_state));
+ struct hd_state * hd = NULL;
+
+ if (size % IDE_SECTOR_SIZE) {
+ PrintError("HD image must be an integral of sector size (IDE_SECTOR_SIZE=%d)\n", IDE_SECTOR_SIZE);
+ return NULL;
+ }
+
+ hd = (struct hd_state *)V3_Malloc(sizeof(struct hd_state));
PrintDebug("Registering Ram HDD at %p (size=%d)\n", (void *)ramdisk, size);