darkkirb/old-MTGos-old
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Tried fixing up the ATA PIO driver (polled)

Browse source
This commit is contained in:
Morten Delenk 2016-03-18 15:24:43 +01:00
parent 2408bb85cd
commit 81e223fc8a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/hal/x86/blk/BlockDevice.cpp
View file

@ -54,7 +54,7 @@ namespace MTGosHAL {
auto BlockDevice::getDriveCnt() -> uint8_t {return numDevices;} auto BlockDevice::getDriveCnt() -> uint8_t {return numDevices;}
auto BlockDevice::getDriveNumByName(const char * name) -> uint8_t { auto BlockDevice::getDriveNumByName(const char * name) -> uint8_t {
if(strlen(name)!=5) if(strlen(name)!=5)
return -1; //Format is ATA[0-3][sl] (regex) return -1; //Format is ATA[0-3][sm] (regex)
if((name[0]!=name[2])||(name[2]!='A')) if((name[0]!=name[2])||(name[2]!='A'))
return -1; return -1;
if(name[1]!='T') if(name[1]!='T')
@ -62,7 +62,7 @@ namespace MTGosHAL {
uint8_t drivenum=name[3]-0x30; uint8_t drivenum=name[3]-0x30;
if(drivenum>3) if(drivenum>3)
return -1; return -1;
if((name[4]!='s')&&(name[4]!='l')) if((name[4]!='s')&&(name[4]!='m'))
return -1; return -1;
drivenum<<=1; drivenum<<=1;
drivenum+=(name[4]=='s')?1:0; drivenum+=(name[4]=='s')?1:0;
@ -84,6 +84,9 @@ namespace MTGosHAL {
outb(ataports[drv>>1]+LBAmid, (uint8_t)(sectorNum>>8)); outb(ataports[drv>>1]+LBAmid, (uint8_t)(sectorNum>>8));
outb(ataports[drv>>1]+LBAhi, (uint8_t)(sectorNum>>16)); outb(ataports[drv>>1]+LBAhi, (uint8_t)(sectorNum>>16));
outb(ataports[drv>>1]+CMD, 0x24); outb(ataports[drv>>1]+CMD, 0x24);
inb(ataports[drv>>1]+CMD);
inb(ataports[drv>>1]+CMD);
inb(ataports[drv>>1]+CMD);
while(inb(ataports[drv>>1]+CMD)&0x80); while(inb(ataports[drv>>1]+CMD)&0x80);
uint16_t *bufw=(uint16_t *)buf; uint16_t *bufw=(uint16_t *)buf;
for(int i=0;i<256;i++) for(int i=0;i<256;i++)

6
kernel/hal/x86/init/init.cpp
View file

@ -40,7 +40,11 @@ namespace MTGosHAL {
idt.setEntry(48, (void *)((uint32_t)&intr_stub_0+768), SEG_KERNEL, IDT_TRAP_GATE | IDT_SEG_32_BIT | IDT_RING_0 | IDT_USED); idt.setEntry(48, (void *)((uint32_t)&intr_stub_0+768), SEG_KERNEL, IDT_TRAP_GATE | IDT_SEG_32_BIT | IDT_RING_0 | IDT_USED);
idt.setEntry(8, (void *)((uint32_t)&intr_stub_0+128), SEG_DBL_FAULT, IDT_TASK_GATE | IDT_SEG_32_BIT | IDT_RING_0 | IDT_USED); idt.setEntry(8, (void *)((uint32_t)&intr_stub_0+128), SEG_DBL_FAULT, IDT_TASK_GATE | IDT_SEG_32_BIT | IDT_RING_0 | IDT_USED);
idt.apply(); idt.apply();
sti(); char sec[513];
sec[512]='\0';
disk.readSector(disk.getDriveNumByName("ATA0m"),1,(uint8_t *)sec);
out << sec;
//sti();
::main(); ::main();
for(;;); for(;;);
} }