thomas/mittos64-old
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIP - ATA fixes

Browse Source
This commit is contained in:
Thomas Lovén 2017-04-01 23:18:51 +02:00
parent abc1a05379
commit 0504349822
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/boot/kmain.c
View File

@ -28,6 +28,7 @@ int kmain(uint64_t multiboot_magic, void *multiboot_data)
pmm_init(); pmm_init();
cpu_init(); cpu_init();
pit_init(); pit_init();
asm("sti");
debug_info("Syscall enabled:%d\n", CPUID_FEATURE_SYSCALL); debug_info("Syscall enabled:%d\n", CPUID_FEATURE_SYSCALL);
@ -45,7 +46,6 @@ int kmain(uint64_t multiboot_magic, void *multiboot_data)
thread_t *th = exec_elf(p1, mboot_data.init, args, env); thread_t *th = exec_elf(p1, mboot_data.init, args, env);
scheduler_insert(th); scheduler_insert(th);
asm("sti");
debug_info("BOOT COMPLETE\n"); debug_info("BOOT COMPLETE\n");
schedule(); schedule();
debug_error("PANIC - This line should be unreachable (%s:%d)\n", __FILE__, __LINE__); debug_error("PANIC - This line should be unreachable (%s:%d)\n", __FILE__, __LINE__);

13
kernel/drivers/ata.c
View File

@ -19,9 +19,8 @@ int ata_wait_status(int bus)
return inb(ATA_STATUS(bus)); return inb(ATA_STATUS(bus));
} }
int ata_send_command(ata_cmd_t *cmd, int wait) int ata_send_command(ata_cmd_t *cmd)
{ {
(void)wait;
outb(ATA_DEVICE(cmd->bus), cmd->device | (cmd->lba_sep[3] & 0xF)); outb(ATA_DEVICE(cmd->bus), cmd->device | (cmd->lba_sep[3] & 0xF));
ata_wait_status(cmd->bus); ata_wait_status(cmd->bus);
@ -82,7 +81,7 @@ void init_drive(ata_drive *drive)
drive->atapi = 1; drive->atapi = 1;
command.command = ATA_CMD_IDENTIFY_PACKET; command.command = ATA_CMD_IDENTIFY_PACKET;
} }
if(!ata_send_command(&command, 1)) if(!ata_send_command(&command))
return; return;
// Read IDENTIFY information // Read IDENTIFY information
@ -109,7 +108,7 @@ int ata_read_block(ata_drive *drive, uint64_t lba, void *buffer)
.command = ATA_CMD_READ_SECTORS, .command = ATA_CMD_READ_SECTORS,
}; };
int status = ata_send_command(&command,0); int status = ata_send_command(&command);
if(status & (ATA_DF | ATA_ERR) || !(status & ATA_DRQ)) if(status & (ATA_DF | ATA_ERR) || !(status & ATA_DRQ))
{ {
retries--; retries--;
@ -136,7 +135,11 @@ int ata_write_block(ata_drive *drive, uint64_t lba, void *buffer)
.device = 0xE0 | drive->ms | ((lba >> 24) & 0xF), .device = 0xE0 | drive->ms | ((lba >> 24) & 0xF),
.command = ATA_CMD_WRITE_SECTORS, .command = ATA_CMD_WRITE_SECTORS,
}; };
ata_send_command(&command, 0); int status = ata_send_command(&command);
if(status & ATA_ERR)
{
debug_error("An error occurred\n");
}
uint16_t *buf = buffer; uint16_t *buf = buffer;
for(int i=0; i<256; i++) for(int i=0; i<256; i++)
{ {