6 files changed, 2 insertions, 6 deletions

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index d2c80e0ae0..35967d7d78 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -28,7 +28,6 @@
 #include "usb.h"
 #include "power.h"
 #include "string.h"
-#include "hwcompat.h"
 #include "ata_idle_notify.h"
 #include "ata-target.h"
 
diff --git a/firmware/drivers/ata_flash.c b/firmware/drivers/ata_flash.c
index 72520ac499..ccdc8c2443 100644
--- a/firmware/drivers/ata_flash.c
+++ b/firmware/drivers/ata_flash.c
@@ -36,7 +36,6 @@
 #include "usb.h"
 #include "power.h"
 #include "string.h"
-#include "hwcompat.h"
 */
 
 #define SECTOR_SIZE     (512)
diff --git a/firmware/drivers/ata_mmc.c b/firmware/drivers/ata_mmc.c
index 377d2444bf..847e282e3b 100644
--- a/firmware/drivers/ata_mmc.c
+++ b/firmware/drivers/ata_mmc.c
@@ -1163,7 +1163,7 @@ int ata_init(void)
     }
 #endif
 
-    new_mmc_circuit = ((read_hw_mask() & MMC_CLOCK_POLARITY) != 0);
+    new_mmc_circuit = ((HW_MASK & MMC_CLOCK_POLARITY) != 0);
     ata_enable(true);
     
     if ( !initialized ) 
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index ec0ddeec41..b54238d085 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -27,7 +27,6 @@
 #include "debug.h"
 #include "system.h"
 #include "font.h"
-#include "hwcompat.h"
 #include "rbunicode.h"
 #include "bidi.h"
 
diff --git a/firmware/drivers/mas.c b/firmware/drivers/mas.c
index a8f910a426..6a1b7cde9a 100644
--- a/firmware/drivers/mas.c
+++ b/firmware/drivers/mas.c
@@ -286,7 +286,7 @@ void mas_reset(void)
     or_b(0x01, &PADRH);
     sleep(HZ/5);
 #elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
-    if (read_hw_mask() & ATA_ADDRESS_200)
+    if (HW_MASK & ATA_ADDRESS_200)
     {
         and_b(~0x01, &PADRH);
         sleep(HZ/100);
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 9334b8e54a..2a87cad2e1 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -23,7 +23,6 @@
 #include "kernel.h"
 #include "system.h"
 #include "power.h"
-#include "hwcompat.h"
 #include "logf.h"
 #include "pcf50605.h"
 #include "pcf50606.h"