compilation fixes and warning reductions

diff --git a/a2091.cpp b/a2091.cpp
index 54dbce1034094169a4df43969bb438987f9b479c..78e0f32237aae423b59306c10842fe1a9f82e666 100644 (file)
--- a/a2091.cpp
+++ b/a2091.cpp
@@ -186,7 +186,7 @@ static struct wd_state *wda2091[] = {
                &wd_a2091_2,
 };
 
-static struct wd_state *wdscsi[] {
+static struct wd_state *wdscsi[] = {
                &wd_a2091,
                &wd_a2091_2,
                &wd_a3000,
@@ -332,6 +332,7 @@ static bool canwddma (struct wd_state *wd)
        return mode == 4 || mode == 1;
 }
 
+#if WD33C93_DEBUG > 0
 static TCHAR *scsitostring (struct wd_state *wd)
 {
        static TCHAR buf[200];
@@ -350,6 +351,7 @@ static TCHAR *scsitostring (struct wd_state *wd)
        }
        return buf;
 }
+#endif
 
 static void dmacheck (struct wd_state *wd)
 {
@@ -375,7 +377,9 @@ static bool do_dma (struct wd_state *wd)
        if (wd->scsi->direction == 0) {
                write_log (_T("%s DMA but no data!?\n"), WD33C93);
        } else if (wd->scsi->direction < 0) {
+#if WD33C93_DEBUG > 0
                uaecptr odmac_acr = wd->dmac_acr;
+#endif
                for (;;) {
                        uae_u8 v;
                        int status = scsi_receive_data (wd->scsi, &v);
@@ -393,7 +397,9 @@ static bool do_dma (struct wd_state *wd)
 #endif
                return true;
        } else if (wd->scsi->direction > 0) {
+#if WD33C93_DEBUG > 0
                uaecptr odmac_acr = wd->dmac_acr;
+#endif
                for (;;) {
                        int status;
                        uae_u8 v = get_byte (wd->dmac_acr);

diff --git a/include/a2091.h b/include/a2091.h
index 394d6acfa028107d42041693e149be0f511687e8..22ee2d7061c52a7d3685052c6bd0ea9fe180f772 100644 (file)
--- a/include/a2091.h
+++ b/include/a2091.h
@@ -8,7 +8,7 @@
 
 struct wd_state {
        bool enabled;
-       TCHAR *name;
+       const TCHAR *name;
        int configured;
        bool autoconfig;
        uae_u8 dmacmemory[100];