further cleanup of message callback changes

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index 1f46d454c618537b918cdddc436029d5442cad23..b5710789028f6356484382246a27588dbd2a11b3 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -32,17 +32,16 @@ typedef void (dcpu16_msg_cb_t)(unsigned int, char *, ...);
 
 /* we may emit any of these types of messages */
 enum dcpu16_msg_type {
-    MSG_ERROR = 0,
-    MSG_INFO,
-    MSG_DEBUG
+    DCPU16_MSG_ERROR = 0,
+    DCPU16_MSG_INFO,
+    DCPU16_MSG_DEBUG
 };
 
 /* update the default message handler */
 dcpu16_msg_cb_t *dcpu16_msg_set_default(dcpu16_msg_cb_t *);
 
-/*
-extern dcpu16_msg_cb_t *dcpu16_msg;
-*/
+/* hardware devices may want to call this directly, without a core context */
+extern dcpu16_msg_cb_t *dcpu16_msg_;
 
 /* a self-contained dcpu16 core */
 struct dcpu16 {