Fix bug in int1308 handling of floppies.

[seabios.git] / src / disk.h

diff --git a/src/disk.h b/src/disk.h
index a82857e40d35f76ed4d84acde6eb68f7715fd9b4..1a3f91db4b77cc73edf5e6bb69417455e1a59ef1 100644 (file)
--- a/src/disk.h
+++ b/src/disk.h
@@ -6,17 +6,21 @@
 #ifndef __DISK_H
 #define __DISK_H
 
-#include "ioport.h" // outb
-#include "biosvar.h" // struct bregs
+#include "types.h" // u8
 
 #define DISK_RET_SUCCESS       0x00
 #define DISK_RET_EPARAM        0x01
+#define DISK_RET_EADDRNOTFOUND 0x02
+#define DISK_RET_EWRITEPROTECT 0x03
 #define DISK_RET_ECHANGED      0x06
 #define DISK_RET_EBOUNDARY     0x09
 #define DISK_RET_EBADTRACK     0x0c
 #define DISK_RET_ECONTROLLER   0x20
 #define DISK_RET_ETIMEOUT      0x80
+#define DISK_RET_ENOTLOCKED    0xb0
+#define DISK_RET_ELOCKED       0xb1
 #define DISK_RET_ENOTREMOVABLE 0xb2
+#define DISK_RET_ETOOMANYLOCKS 0xb4
 #define DISK_RET_EMEDIA        0xC0
 #define DISK_RET_ENOTREADY     0xAA
 
@@ -27,9 +31,8 @@ struct int13ext_s {
     u16 count;
     u16 offset;
     u16 segment;
-    u32 lba1;
-    u32 lba2;
-};
+    u64 lba;
+} PACKED;
 
 #define GET_INT13EXT(regs,var)                                          \
     GET_FARVAR((regs)->ds, ((struct int13ext_s*)((regs)->si+0))->var)
@@ -43,8 +46,7 @@ struct int13dpt_s {
     u32 cylinders;
     u32 heads;
     u32 spt;
-    u32 sector_count1;
-    u32 sector_count2;
+    u64 sector_count;
     u16 blksize;
     u16 dpte_offset;
     u16 dpte_segment;
@@ -58,7 +60,7 @@ struct int13dpt_s {
     u8  device_path[8];
     u8  reserved3;
     u8  checksum;
-};
+} PACKED;
 
 #define GET_INT13DPT(regs,var)                                          \
     GET_FARVAR((regs)->ds, ((struct int13dpt_s*)((regs)->si+0))->var)
@@ -78,7 +80,7 @@ struct floppy_dbt_s {
     u8 fill_byte;
     u8 settle_time;
     u8 startup_time;
-};
+} PACKED;
 
 struct floppy_ext_dbt_s {
     struct floppy_dbt_s dbt;
@@ -86,10 +88,30 @@ struct floppy_ext_dbt_s {
     u8 max_track;
     u8 data_rate;
     u8 drive_type;
-};
+} PACKED;
+
+// Helper function for setting up a return code.
+struct bregs;
+void __disk_ret(const char *fname, int lineno, struct bregs *regs, u8 code);
+#define disk_ret(regs, code) \
+    __disk_ret(__func__, __LINE__, (regs), (code))
 
 // floppy.c
+extern struct floppy_ext_dbt_s diskette_param_table2;
+void floppy_drive_setup();
 void floppy_13(struct bregs *regs, u8 drive);
 void floppy_tick();
 
+// disk.c
+void disk_13(struct bregs *regs, u8 device);
+void disk_13XX(struct bregs *regs, u8 device);
+
+// cdrom.c
+int cdrom_read_emu(u16 device, u32 lba, u32 count, void *far_buffer);
+void cdrom_13(struct bregs *regs, u8 device);
+void cdemu_13(struct bregs *regs);
+void cdemu_134b(struct bregs *regs);
+int cdrom_boot();
+
+
 #endif // disk.h