--- libelwix/inc/elwix/apack.h	2013/06/30 21:51:57	1.1.2.5
+++ libelwix/inc/elwix/apack.h	2013/06/30 22:06:25	1.1.2.6
@@ -22,6 +22,27 @@ typedef struct tagRawPacket {
 					*((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \
 					*((uint8_t *) (x) + 0) = *((const uint8_t *) (n) + 0); \
 				} while (0)
+#define RPACK_SET_24(x, n)	do { assert((x)); \
+					*((uint8_t *) (x) + 2) = *((const uint8_t *) (n) + 2); \
+					*((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \
+					*((uint8_t *) (x) + 0) = *((const uint8_t *) (n) + 0); \
+				} while (0)
+#define RPACK_SET_32(x, n)	do { assert((x)); \
+					*((uint8_t *) (x) + 3) = *((const uint8_t *) (n) + 3); \
+					*((uint8_t *) (x) + 2) = *((const uint8_t *) (n) + 2); \
+					*((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \
+					*((uint8_t *) (x) + 0) = *((const uint8_t *) (n) + 0); \
+				} while (0)
+#define RPACK_SET_64(x, n)	do { assert((x)); \
+					*((uint8_t *) (x) + 7) = *((const uint8_t *) (n) + 7); \
+					*((uint8_t *) (x) + 6) = *((const uint8_t *) (n) + 6); \
+					*((uint8_t *) (x) + 5) = *((const uint8_t *) (n) + 5); \
+					*((uint8_t *) (x) + 4) = *((const uint8_t *) (n) + 4); \
+					*((uint8_t *) (x) + 3) = *((const uint8_t *) (n) + 3); \
+					*((uint8_t *) (x) + 2) = *((const uint8_t *) (n) + 2); \
+					*((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \
+					*((uint8_t *) (x) + 0) = *((const uint8_t *) (n) + 0); \
+				} while (0)
 
 #define EXTRACT_LE_8(x)		(assert((x)), *(x))
 #define EXTRACT_LE_16(x)	(assert((x)), (u_int16_t) ( \
@@ -135,14 +156,6 @@ uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_
  * return: -1 error or get value
  */
 uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n);
-/*
- * rpack_uint48() - Pack/Unpack 48bit value
- *
- * @rp = raw buffer
- * @n = set value if !=NULL
- * return: -1 error or get value
- */
-uint64_t rpack_uint48(rpack_t * __restrict rp, uint64_t * __restrict n);
 /*
  * rpack_uint64() - Pack/Unpack 64bit value
  *