X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fdisk.h;h=dd7c46aec3c19913d6cf257d62b5a2f706580cd3;hb=refs%2Fheads%2Fcoreboot;hp=68e59a0ec6b4aa0a2e87190bcf2b1baf0ac8f3a6;hpb=9ae1e9b2c89912920a37d6e1593d4faa90a68e4b;p=seabios.git diff --git a/src/disk.h b/src/disk.h index 68e59a0..dd7c46a 100644 --- a/src/disk.h +++ b/src/disk.h @@ -8,6 +8,7 @@ #include "types.h" // u8 #include "config.h" // CONFIG_* +#include "farptr.h" // struct segoff_s #define DISK_RET_SUCCESS 0x00 #define DISK_RET_EPARAM 0x01 @@ -35,8 +36,7 @@ struct int13ext_s { u8 size; u8 reserved; u16 count; - u16 offset; - u16 segment; + struct segoff_s data; u64 lba; } PACKED; @@ -63,9 +63,18 @@ struct int13dpt_s { u8 host_bus[4]; u8 iface_type[8]; u64 iface_path; - u64 device_path; - u8 reserved3; - u8 checksum; + union { + struct { + u64 device_path; + u8 reserved3; + u8 checksum; + } phoenix; + struct { + u64 device_path[2]; + u8 reserved3; + u8 checksum; + } t13; + }; } PACKED; #define GET_INT13DPT(regs,var) \ @@ -101,6 +110,10 @@ struct bregs; void __disk_ret(struct bregs *regs, u32 linecode, const char *fname); #define disk_ret(regs, code) \ __disk_ret((regs), (code) | (__LINE__ << 8), __func__) +void __disk_ret_unimplemented(struct bregs *regs, u32 linecode + , const char *fname); +#define disk_ret_unimplemented(regs, code) \ + __disk_ret_unimplemented((regs), (code) | (__LINE__ << 8), __func__) /**************************************************************** @@ -144,13 +157,18 @@ struct mbr_s { struct disk_op_s { u64 lba; void *buf_fl; + struct drive_s *drive_g; u16 count; - u8 driveid; u8 command; }; -#define CMD_CDROM_READ 1 -#define CMD_CDEMU_READ 2 +#define CMD_RESET 0x00 +#define CMD_READ 0x02 +#define CMD_WRITE 0x03 +#define CMD_VERIFY 0x04 +#define CMD_FORMAT 0x05 +#define CMD_SEEK 0x07 +#define CMD_ISREADY 0x10 /**************************************************************** @@ -163,72 +181,81 @@ struct chs_s { u16 spt; // # sectors / track }; -struct ata_channel_s { - u16 iobase1; // IO Base 1 - u16 iobase2; // IO Base 2 - u16 pci_bdf; - u8 irq; // IRQ +struct drive_s { + u8 type; // Driver type (DTYPE_*) + u8 floppy_type; // Type of floppy (only for floppy drives). + struct chs_s lchs; // Logical CHS + u64 sectors; // Total sectors count + u32 cntl_id; // Unique id for a given driver type. + u8 removable; // Is media removable (currently unused) + + // Info for EDD calls + u8 translation; // type of translation + u16 blksize; // block size + struct chs_s pchs; // Physical CHS }; -struct ata_device_s { - u8 type; // Detected type of ata (ata/atapi/none/unknown) - u8 device; // Detected type of attached devices (hd/cd/none) - u8 removable; // Removable device flag - u16 blksize; // block size - u8 version; // ATA/ATAPI version +#define DISK_SECTOR_SIZE 512 +#define CDROM_SECTOR_SIZE 2048 - char model[41]; +#define DTYPE_NONE 0x00 +#define DTYPE_FLOPPY 0x01 +#define DTYPE_ATA 0x02 +#define DTYPE_ATAPI 0x03 +#define DTYPE_RAMDISK 0x04 +#define DTYPE_CDEMU 0x05 +#define DTYPE_USB 0x06 +#define DTYPE_VIRTIO_BLK 0x07 +#define DTYPE_AHCI 0x08 - u8 translation; // type of translation - struct chs_s lchs; // Logical CHS - struct chs_s pchs; // Physical CHS +#define MAXDESCSIZE 80 - u64 sectors; // Total sectors count -}; +#define TRANSLATION_NONE 0 +#define TRANSLATION_LBA 1 +#define TRANSLATION_LARGE 2 +#define TRANSLATION_RECHS 3 -struct ata_s { - // ATA channels info - struct ata_channel_s channels[CONFIG_MAX_ATA_INTERFACES]; +#define EXTTYPE_FLOPPY 0 +#define EXTTYPE_HD 1 +#define EXTTYPE_CD 2 - // ATA devices info - struct ata_device_s devices[CONFIG_MAX_ATA_DEVICES]; - // - // map between bios hd/cd id and ata channels - u8 cdcount; - u8 idmap[2][CONFIG_MAX_ATA_DEVICES]; -}; +#define EXTSTART_HD 0x80 +#define EXTSTART_CD 0xE0 /**************************************************************** * Function defs ****************************************************************/ -// ata.c -extern struct ata_s ATA; -int ata_cmd_data(struct disk_op_s *op); -int cdrom_read(struct disk_op_s *op); -int ata_cmd_packet(int driveid, u8 *cmdbuf, u8 cmdlen - , u32 length, void *buf_fl); -void ata_reset(int driveid); -void hard_drive_setup(); -void map_drive(int driveid); +// block.c +extern u8 FloppyCount, CDCount; +extern u8 *bounce_buf_fl; +struct drive_s *getDrive(u8 exttype, u8 extdriveoffset); +int getDriveId(u8 exttype, struct drive_s *drive_g); +void map_floppy_drive(struct drive_s *drive_g); +void map_hd_drive(struct drive_s *drive_g); +void map_cd_drive(struct drive_s *drive_g); +int process_op(struct disk_op_s *op); +int send_disk_op(struct disk_op_s *op); +int bounce_buf_init(void); // floppy.c -extern u8 FloppyCount; 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); -void cdemu_access(struct bregs *regs, u8 device, u16 command); +void floppy_setup(void); +struct drive_s *init_floppy(int floppyid, int ftype); +int find_floppy_type(u32 size); +int process_floppy_op(struct disk_op_s *op); +void floppy_tick(void); // cdrom.c -void cdrom_13(struct bregs *regs, u8 device); -void cdemu_13(struct bregs *regs); +extern struct drive_s *cdemu_drive_gf; +int process_cdemu_op(struct disk_op_s *op); +void cdemu_setup(void); void cdemu_134b(struct bregs *regs); -int cdrom_boot(int cdid); +int cdrom_boot(struct drive_s *drive_g); + +// ramdisk.c +void ramdisk_setup(void); +int process_ramdisk_op(struct disk_op_s *op); #endif // disk.h