Merge remote branch 'kwolf/for-anthony' into staging

[qemu.git] / hw / tc58128.c

diff --git a/hw/tc58128.c b/hw/tc58128.c
index 2f1b305d47b5b9892c847e42b08daaf0d93ca27c..672a01c467be53199f1850828e73de61888da007 100644 (file)
--- a/hw/tc58128.c
+++ b/hw/tc58128.c
@@ -1,7 +1,7 @@
-#include <assert.h>
 #include "hw.h"
 #include "sh.h"
 #include "sysemu.h"
+#include "loader.h"
 
 #define CE1  0x0100
 #define CE2  0x0200
@@ -82,7 +82,7 @@ static void handle_command(tc58128_dev * dev, uint8_t command)
        break;
     default:
        fprintf(stderr, "unknown flash command 0x%02x\n", command);
-       assert(0);
+        abort();
     }
 }
 
@@ -110,12 +110,12 @@ static void handle_address(tc58128_dev * dev, uint8_t data)
            break;
        default:
            /* Invalid data */
-           assert(0);
+            abort();
        }
        dev->address_cycle++;
        break;
     default:
-       assert(0);
+        abort();
     }
 }
 
@@ -164,7 +164,7 @@ static int tc58128_cb(uint16_t porta, uint16_t portb,
        *periph_pdtra &= 0xff00;
        *periph_pdtra |= handle_read(&tc58128_devs[dev]);
     } else {
-       assert(0);
+        abort();
     }
     return 1;
 }