X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=fwcutter%2Ffwcutter.c;h=dcd92cee595542bf67e6db75bbdd9721062d90d6;hb=87c4f3d4ec9949685b0bbe75b8233bd2b0c92ce1;hp=0d828067e26cecb0e63a90d6b3bbb2bdda2fee77;hpb=37164fe78406e201302ec8bd975698bec48183b9;p=b43-tools.git

diff --git a/fwcutter/fwcutter.c b/fwcutter/fwcutter.c
index 0d82806..dcd92ce 100644
--- a/fwcutter/fwcutter.c
+++ b/fwcutter/fwcutter.c
@@ -38,7 +38,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#ifdef __DragonFly__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <sys/endian.h>
 #else
 #include <byteswap.h>
@@ -48,7 +48,7 @@
 #include "fwcutter.h"
 #include "fwcutter_list.h"
 
-#ifdef __DragonFly__
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #define V3_FW_DIRNAME	"v3"
 #define V4_FW_DIRNAME	"v4"
 #else
@@ -65,18 +65,6 @@ static int file_ok(const struct file *f)
 	return !(f->flags & FW_FLAG_UNSUPPORTED) || cmdargs.unsupported;
 }
 
-/* Convert a CPU-endian 16bit integer to Big-Endian */
-static be16_t to_be16(uint16_t v)
-{
-	uint8_t ret[2];
-
-	ret[0] = (v & 0xFF00) >> 8;
-	ret[1] = (v & 0x00FF);
-
-	return *((be16_t *)ret);
-}
-
-#if 0
 /* Convert a Big-Endian 16bit integer to CPU-endian */
 static uint16_t from_be16(be16_t v)
 {
@@ -87,19 +75,11 @@ static uint16_t from_be16(be16_t v)
 
 	return ret;
 }
-#endif
 
-/* Convert a CPU-endian 32bit integer to Big-Endian */
-static be32_t to_be32(uint32_t v)
+/* Convert a CPU-endian 16bit integer to Big-Endian */
+static be16_t to_be16(uint16_t v)
 {
-	uint8_t ret[4];
-
-	ret[0] = (v & 0xFF000000) >> 24;
-	ret[1] = (v & 0x00FF0000) >> 16;
-	ret[2] = (v & 0x0000FF00) >> 8;
-	ret[3] = (v & 0x000000FF);
-
-	return *((be32_t *)ret);
+	return (be16_t)from_be16((be16_t)v);
 }
 
 /* Convert a Big-Endian 32bit integer to CPU-endian */
@@ -115,6 +95,12 @@ static uint32_t from_be32(be32_t v)
 	return ret;
 }
 
+/* Convert a CPU-endian 32bit integer to Big-Endian */
+static be32_t to_be32(uint32_t v)
+{
+	return (be32_t)from_be32((be32_t)v);
+}
+
 /* tiny disassembler */
 static void print_ucode_version(struct insn *insn)
 {