Changeset 159 for trunk

Timestamp:

10/09/07 02:09:38 (15 months ago)

Author:

dragorn

Message:

Added patches for win32 native headers and def to generate lib and exp
files on win32

Location:

trunk

Files:

• orcon.def (added)
• tx80211.h (modified) (8 diffs)

trunk/tx80211.h

@@ -120 +120 @@
  * bitmasks.
  */
+
+#ifdef _MSC_VER
+#pragma pack(push, 1)
+#endif
 
 struct tx80211_radiotap_header {
@@ -146 +150 @@
         uint16_t wr_chan_freq;          /* Frequency flags */
         uint16_t wr_chan_flags;         /* Modulation flags */
-} __attribute__((__packed__));
+}
+#ifdef _MSC_VER
+#pragma pack(pop)
+#else           
+__attribute__((__packed__))
+#endif
+;
 
 #define TX80211_RTAP_PRESENT (1 << TX_IEEE80211_RADIOTAP_FLAGS | \
@@ -258 +268 @@
 
 /* Swap magic */
+#ifdef _MSC_VER
+
+#define tx80211_swap16(x) (uint16_t)( \
+                (((uint16_t)(x) & 0x00ff) << 8) | (((uint16_t)(x) & 0xff00) >> 8))
+
+#define tx80211_swap32(x) (uint32_t)( \
+        (((uint32_t)(x) & (uint32_t)0x000000ff) << 24) | \
+        (((uint32_t)(x) & (uint32_t)0x0000ff00) << 8) | \
+        (((uint32_t)(x) & (uint32_t)0x00ff0000) >> 8) | \
+        (((uint32_t)(x) & (uint32_t)0xff000000) >> 24) )
+
+#define tx80211_swap64(x) (uint64_t)( \
+        (((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) | \
+        (((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) | \
+        (((uint64_t)(x) & (uint64_t)0x0000000000ff0000ULL) << 24) | \
+        (((uint64_t)(x) & (uint64_t)0x00000000ff000000ULL) <<  8) | \
+        (((uint64_t)(x) & (uint64_t)0x000000ff00000000ULL) >>  8) | \
+        (((uint64_t)(x) & (uint64_t)0x0000ff0000000000ULL) >> 24) | \
+        (((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \
+        (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )
+#else
+
 #define tx80211_swap16(x) \
 ({ \
@@ -290 +322 @@
 })
 
+#endif
+
 /* Byteswap magic for turning an element into the endian format
  * that the driver expects it to be.  These are known to be accurate
@@ -296 +330 @@
  * These are to be used to flip bits when building packet structs.
  */
+#ifdef _MSC_VER
+static tx80211_endian16(struct tx80211 *x, uint16_t y)
+#else
 static inline tx80211_endian16(struct tx80211 *x, uint16_t y)
+#endif
 {
         switch (x->injectortype) {
@@ -302 +340 @@
         case INJ_HOSTAP:
                 return tx80211_be16(y);
-                break;
         case INJ_PRISM54:
         case INJ_MADWIFIOLD:
                 return tx80211_le16(y);
-                break;
         }
         return y;
 }
-
+#ifdef _MSC_VER
+static tx80211_endian32(struct tx80211 *x, uint32_t y)
+#else
 static inline tx80211_endian32(struct tx80211 *x, uint32_t y)
+#endif
 {
         switch (x->injectortype) {
@@ -317 +356 @@
         case INJ_HOSTAP:
                 return tx80211_be32(y);
-                break;
         case INJ_PRISM54:
         case INJ_MADWIFIOLD:
                 return tx80211_le32(y);
-                break;
         }
         return y;
 }
 
+#ifdef _MSC_VER
+static tx80211_endian64(struct tx80211 *x, uint64_t y)
+#else
 static inline tx80211_endian64(struct tx80211 *x, uint64_t y)
+#endif
 {
         switch (x->injectortype) {
@@ -332 +373 @@
         case INJ_HOSTAP:
                 return tx80211_be64(y);
-                break;
         case INJ_PRISM54:
         case INJ_MADWIFIOLD:
                 return tx80211_le64(y);
-                break;
         }
         return y;