aboutsummaryrefslogtreecommitdiff
path: root/extmod/machine_mem.h
diff options
context:
space:
mode:
authorDave Hylands <dhylands@gmail.com>2015-12-13 16:11:20 -0800
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2015-12-18 22:01:03 +0200
commit755b01439bab486d3ccb3c6eddccd10aae045f23 (patch)
tree61b867c8369f8c49f523c4d9866a9814e83c64b4 /extmod/machine_mem.h
parentacaccb37ecae4e29c1e3e6fcd67c4b59bf39dfbd (diff)
unix: machine_mem improvements
This basically introduces the MICROPY_MACHINE_MEM_GET_READ_ADDR and MICROPY_MACHINE_MEM_GET_WRITE_ADDR macros. If one of them is not defined, then a default identity function is provided.
Diffstat (limited to 'extmod/machine_mem.h')
-rw-r--r--extmod/machine_mem.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/extmod/machine_mem.h b/extmod/machine_mem.h
index aeac0c2a2..fddd7d46c 100644
--- a/extmod/machine_mem.h
+++ b/extmod/machine_mem.h
@@ -25,8 +25,8 @@
*/
-#ifndef MICROPY_EXTMOD_MACHINE_MEM
-#define MICROPY_EXTMOD_MACHINE_MEM
+#ifndef __MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H__
+#define __MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H__
#include "py/obj.h"
@@ -41,10 +41,11 @@ extern const machine_mem_obj_t machine_mem8_obj;
extern const machine_mem_obj_t machine_mem16_obj;
extern const machine_mem_obj_t machine_mem32_obj;
-// It is expected that a port will provide the following 2 functions.
-// We define the prototypes here, but the modmachine.c file for a port should
-// provide the implementation
-uintptr_t machine_mem_get_read_addr(mp_obj_t addr_o, uint align);
-uintptr_t machine_mem_get_write_addr(mp_obj_t addr_o, uint align);
+#if defined(MICROPY_MACHINE_MEM_GET_READ_ADDR)
+uintptr_t MICROPY_MACHINE_MEM_GET_READ_ADDR(mp_obj_t addr_o, uint align);
+#endif
+#if defined(MICROPY_MACHINE_MEM_GET_WRITE_ADDR)
+uintptr_t MICROPY_MACHINE_MEM_GET_WRITE_ADDR(mp_obj_t addr_o, uint align);
+#endif
-#endif /* MICROPY_EXTMOD_MACHINE_MEM */
+#endif // __MICROPY_INCLUDED_EXTMOD_MACHINE_MEM_H__