summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/prism2.c
diff options
context:
space:
mode:
authorMarty Connor2007-07-05 01:47:01 +0200
committerMarty Connor2007-07-05 01:47:01 +0200
commite5950283ec6e07f6bf646adf35ce3d06c184d623 (patch)
treec641ed70c5f1d020509482caf3dbdfd63abf9070 /src/drivers/net/prism2.c
parentMerge branch 'master' of /pub/scm/gpxe (diff)
downloadipxe-e5950283ec6e07f6bf646adf35ce3d06c184d623.tar.gz
ipxe-e5950283ec6e07f6bf646adf35ce3d06c184d623.tar.xz
ipxe-e5950283ec6e07f6bf646adf35ce3d06c184d623.zip
Purge warnings from prism2 drivers
Diffstat (limited to 'src/drivers/net/prism2.c')
-rw-r--r--src/drivers/net/prism2.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/drivers/net/prism2.c b/src/drivers/net/prism2.c
index 52bc77b8..3c512519 100644
--- a/src/drivers/net/prism2.c
+++ b/src/drivers/net/prism2.c
@@ -13,8 +13,8 @@ $Id$
* your option) any later version.
*/
-#include "etherboot.h"
-#include "nic.h"
+#include <etherboot.h>
+#include <nic.h>
#include <gpxe/pci.h>
#include <gpxe/ethernet.h>
@@ -68,6 +68,11 @@ static const char hardcoded_ssid[] = "";
#define __cpu_to_le16(x) (x)
#define __cpu_to_le32(x) (x)
+#define hfa384x2host_16(n) (__le16_to_cpu((UINT16)(n)))
+#define hfa384x2host_32(n) (__le32_to_cpu((UINT32)(n)))
+#define host2hfa384x_16(n) (__cpu_to_le16((UINT16)(n)))
+#define host2hfa384x_32(n) (__cpu_to_le32((UINT32)(n)))
+
/*
* PLX9052 PCI register offsets
* Taken from PLX9052 datasheet available from http://www.plxtech.com/download/9052/databook/9052db-20.pdf
@@ -135,19 +140,19 @@ static hfa384x_t hw_global = {
typedef struct wlan_llc
{
- UINT8 dsap __WLAN_ATTRIB_PACK__;
- UINT8 ssap __WLAN_ATTRIB_PACK__;
- UINT8 ctl __WLAN_ATTRIB_PACK__;
-} __WLAN_ATTRIB_PACK__ wlan_llc_t;
+ UINT8 dsap;
+ UINT8 ssap;
+ UINT8 ctl;
+} wlan_llc_t;
static const wlan_llc_t wlan_llc_snap = { 0xaa, 0xaa, 0x03 }; /* LLC header indicating SNAP (?) */
#define WLAN_IEEE_OUI_LEN 3
typedef struct wlan_snap
{
- UINT8 oui[WLAN_IEEE_OUI_LEN] __WLAN_ATTRIB_PACK__;
- UINT16 type __WLAN_ATTRIB_PACK__;
-} __WLAN_ATTRIB_PACK__ wlan_snap_t;
+ UINT8 oui[WLAN_IEEE_OUI_LEN];
+ UINT16 type;
+} wlan_snap_t;
typedef struct wlan_80211hdr
{