git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfixes to usermode 64-bit division, more work on GUI (now sizes almost correctly)
[tpg/acess2.git]
/
Modules
/
Storage
/
ATA
/
main.c
diff --git
a/Modules/Storage/ATA/main.c
b/Modules/Storage/ATA/main.c
index
2bb151d
..
3e7cb61
100644
(file)
--- a/
Modules/Storage/ATA/main.c
+++ b/
Modules/Storage/ATA/main.c
@@
-2,7
+2,7
@@
* Acess2 IDE Harddisk Driver
* - main.c
*/
* Acess2 IDE Harddisk Driver
* - main.c
*/
-#define DEBUG
1
+#define DEBUG
0
#include <acess.h>
#include <modules.h>
#include <vfs.h>
#include <acess.h>
#include <modules.h>
#include <vfs.h>
@@
-76,7
+76,7
@@
void ATA_int_BusMasterWriteByte(int Ofs, Uint8 Value);
void ATA_int_BusMasterWriteDWord(int Ofs, Uint32 Value);
// === GLOBALS ===
void ATA_int_BusMasterWriteDWord(int Ofs, Uint32 Value);
// === GLOBALS ===
-MODULE_DEFINE(0, 0x0032, i386ATA, ATA_Install, NULL, NULL);
+MODULE_DEFINE(0, 0x0032, i386ATA, ATA_Install, NULL,
"PCI",
NULL);
tDevFS_Driver gATA_DriverInfo = {
NULL, "ata",
{
tDevFS_Driver gATA_DriverInfo = {
NULL, "ata",
{
@@
-140,7
+140,8
@@
int ATA_SetupIO()
LOG("ent = %i", ent);
gATA_BusMasterBase = PCI_GetBAR4( ent );
if( gATA_BusMasterBase == 0 ) {
LOG("ent = %i", ent);
gATA_BusMasterBase = PCI_GetBAR4( ent );
if( gATA_BusMasterBase == 0 ) {
- Warning("It seems that there is no Bus Master Controller on this machine. Get one");
+ Log_Warning("ATA", "It seems that there is no Bus Master Controller on this machine. Get one");
+ // TODO: Use PIO mode instead
LEAVE('i', MODULE_ERR_NOTNEEDED);
return MODULE_ERR_NOTNEEDED;
}
LEAVE('i', MODULE_ERR_NOTNEEDED);
return MODULE_ERR_NOTNEEDED;
}
@@
-151,7
+152,7
@@
int ATA_SetupIO()
if( gATA_BusMasterBase < 0x100000 )
gATA_BusMasterBasePtr = (void*)(0xC0000000|gATA_BusMasterBase);
else
if( gATA_BusMasterBase < 0x100000 )
gATA_BusMasterBasePtr = (void*)(0xC0000000|gATA_BusMasterBase);
else
- gATA_BusMasterBasePtr = (void*)( MM_MapHWPage( gATA_BusMasterBase, 1 ) + (gATA_BusMasterBase&0xFFF) );
+ gATA_BusMasterBasePtr = (void*)( MM_MapHWPage
s
( gATA_BusMasterBase, 1 ) + (gATA_BusMasterBase&0xFFF) );
LOG("gATA_BusMasterBasePtr = %p", gATA_BusMasterBasePtr);
}
else {
LOG("gATA_BusMasterBasePtr = %p", gATA_BusMasterBasePtr);
}
else {
UCC
git Repository :: git.ucc.asn.au