Merge branch 'master' of [email protected]:acess2

diff --combined Makefile.cfg
index ecf32ac,57c285a..991a98d
--- 1/Makefile.cfg
--- 2/Makefile.cfg
+++ b/Makefile.cfg
@@@ -19,7 -19,6 +19,7 @@@ xRM = mde
  ifeq ($(ARCH),)
        ARCH = i386
  endif
 +-include Makefile.$(ARCH).cfg
  ifeq ($(ARCHDIR),)
        ARCHDIR = x86
  endif
@@@ -29,7 -28,7 +29,7 @@@ DRIVERS 
  MODULES  = Storage/ATA Storage/FDD
  MODULES += Network/NE2000
  MODULES += Display/VESA
- #MODULES += Display/BochsGA
+ MODULES += Display/BochsGA
  MODULES += Filesystems/Ext2
  MODULES += Filesystems/FAT
  MODULES += IPStack

diff --combined Modules/Storage/ATA/main.c
index 3ba921d,3e7cb61..dac5a2a
--- 1/Modules/Storage/ATA/main.c
--- 2/Modules/Storage/ATA/main.c
+++ b/Modules/Storage/ATA/main.c
@@@ -140,7 -140,8 +140,8 @@@ int ATA_SetupIO(
        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;
        }
@@@ -149,7 -150,7 +150,7 @@@
        if( !(gATA_BusMasterBase & 1) )
        {
                if( gATA_BusMasterBase < 0x100000 )
 -                      gATA_BusMasterBasePtr = (void*)(0xC0000000|gATA_BusMasterBase);
 +                      gATA_BusMasterBasePtr = (void*)(KERNEL_BASE|gATA_BusMasterBase);
                else
                        gATA_BusMasterBasePtr = (void*)( MM_MapHWPages( gATA_BusMasterBase, 1 ) + (gATA_BusMasterBase&0xFFF) );
                LOG("gATA_BusMasterBasePtr = %p", gATA_BusMasterBasePtr);