From e85e8fae565e24bfe6ec5c7f741aa89fb5ae56dd Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 May 2025 12:55:50 +0200
Subject: [PATCH] fb: move MEMCPY_WRAPPED() and MEMSET_WRAPPED() into fbblt.c

Only used inside fbblt.c, so we can move them into there.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 fb/fb.h    | 18 ------------------
 fb/fbblt.c | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index 712fa1baf..e2b249a3c 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -48,29 +48,11 @@
 #define WRITE(ptr, val) ((*wfbWriteMemory)((ptr), (val), sizeof(*(ptr))))
 #define READ(ptr) ((*wfbReadMemory)((ptr), sizeof(*(ptr))))
 
-#define MEMCPY_WRAPPED(dst, src, size) do {                       \
-    size_t _i;                                                    \
-    CARD8 *_dst = (CARD8*)(dst), *_src = (CARD8*)(src);           \
-    for(_i = 0; _i < size; _i++) {                                \
-        WRITE(_dst +_i, READ(_src + _i));                         \
-    }                                                             \
-} while(0)
-
-#define MEMSET_WRAPPED(dst, val, size) do {                       \
-    size_t _i;                                                    \
-    CARD8 *_dst = (CARD8*)(dst);                                  \
-    for(_i = 0; _i < size; _i++) {                                \
-        WRITE(_dst +_i, (val));                                   \
-    }                                                             \
-} while(0)
-
 #else
 
 #define FBPREFIX(x) fb##x
 #define WRITE(ptr, val) (*(ptr) = (val))
 #define READ(ptr) (*(ptr))
-#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
-#define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
 
 #endif
 
diff --git a/fb/fbblt.c b/fb/fbblt.c
index b0ac72b82..112c77101 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -25,6 +25,31 @@
 #include <string.h>
 #include "fb.h"
 
+#ifdef FB_ACCESS_WRAPPER
+
+#define MEMCPY_WRAPPED(dst, src, size) do {                       \
+    size_t _i;                                                    \
+    CARD8 *_dst = (CARD8*)(dst), *_src = (CARD8*)(src);           \
+    for(_i = 0; _i < size; _i++) {                                \
+        WRITE(_dst +_i, READ(_src + _i));                         \
+    }                                                             \
+} while(0)
+
+#define MEMSET_WRAPPED(dst, val, size) do {                       \
+    size_t _i;                                                    \
+    CARD8 *_dst = (CARD8*)(dst);                                  \
+    for(_i = 0; _i < size; _i++) {                                \
+        WRITE(_dst +_i, (val));                                   \
+    }                                                             \
+} while(0)
+
+#else
+
+#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
+#define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
+
+#endif /* FB_ACCESS_WRAPPER */
+
 #define InitializeShifts(sx,dx,ls,rs) { \
     if (sx != dx) { \
 	if (sx > dx) { \