From 4c2126b5a8b0bea04d4c5ba8bee032f9bc0efbe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <rafael.carre@gmail.com>
Date: Thu, 29 Dec 2011 21:58:34 +0000
Subject: usb PACK_DATA: use a static inline to enable type checking

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31467 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/usbstack/usb_class_driver.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'firmware/usbstack/usb_class_driver.h')

diff --git a/firmware/usbstack/usb_class_driver.h b/firmware/usbstack/usb_class_driver.h
index c8d1e70..20ee26a 100644
--- a/firmware/usbstack/usb_class_driver.h
+++ b/firmware/usbstack/usb_class_driver.h
@@ -85,10 +85,10 @@ struct usb_class_driver {
 #endif
 };
 
-#define PACK_DATA(dest, data) \
-    do { \
-        memcpy(dest, &(data), sizeof(data)); \
-        dest += sizeof(data); \
-    } while (0)
-
+#define PACK_DATA(dest, data) pack_data(dest, &(data), sizeof(data))
+static inline void pack_data(uint8_t **dest, const void *data, size_t size)
+{
+    memcpy(*dest, data, size);
+    *dest += size;
+}
 #endif
-- 
cgit v1.1