Module Name: src
Committed By: riastradh
Date: Wed Jul 22 17:21:26 UTC 2020
Modified Files:
src/sys/dev/ic: bwfm.c bwfmreg.h bwfmvar.h
Log Message:
Add include guards and appropriate includes to bwfmreg.h, bwfmvar.h.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/bwfm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/bwfmreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/bwfmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/bwfm.c
diff -u src/sys/dev/ic/bwfm.c:1.27 src/sys/dev/ic/bwfm.c:1.28
--- src/sys/dev/ic/bwfm.c:1.27 Wed Jul 22 17:18:49 2020
+++ src/sys/dev/ic/bwfm.c Wed Jul 22 17:21:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bwfm.c,v 1.27 2020/07/22 17:18:49 riastradh Exp $ */
+/* $NetBSD: bwfm.c,v 1.28 2020/07/22 17:21:25 riastradh Exp $ */
/* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -40,6 +40,8 @@
#include <net80211/ieee80211_var.h>
+#include <dev/firmload.h>
+
#include <dev/ic/bwfmreg.h>
#include <dev/ic/bwfmvar.h>
Index: src/sys/dev/ic/bwfmreg.h
diff -u src/sys/dev/ic/bwfmreg.h:1.6 src/sys/dev/ic/bwfmreg.h:1.7
--- src/sys/dev/ic/bwfmreg.h:1.6 Mon Oct 28 06:37:51 2019
+++ src/sys/dev/ic/bwfmreg.h Wed Jul 22 17:21:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bwfmreg.h,v 1.6 2019/10/28 06:37:51 mlelstv Exp $ */
+/* $NetBSD: bwfmreg.h,v 1.7 2020/07/22 17:21:25 riastradh Exp $ */
/* $OpenBSD: bwfmreg.h,v 1.16 2018/02/07 21:44:09 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -17,6 +17,19 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef _DEV_IC_BWFMREG_H
+#define _DEV_IC_BWFMREG_H
+
+#include <sys/param.h>
+#include <sys/types.h>
+
+#include <sys/cdefs.h>
+
+#include <net/if.h>
+#include <net/if_ether.h>
+
+#include <net80211/ieee80211.h>
+
/* SDIO registers */
#define BWFM_SDIO_FUNC1_SBADDRLOW 0x1000A
#define BWFM_SDIO_FUNC1_SBADDRMID 0x1000B
@@ -785,3 +798,5 @@ struct bwfm_event {
struct bwfm_ethhdr hdr;
struct bwfm_event_msg msg;
} __packed;
+
+#endif /* _DEV_IC_BWFMREG_H */
Index: src/sys/dev/ic/bwfmvar.h
diff -u src/sys/dev/ic/bwfmvar.h:1.10 src/sys/dev/ic/bwfmvar.h:1.11
--- src/sys/dev/ic/bwfmvar.h:1.10 Sat May 30 15:55:47 2020
+++ src/sys/dev/ic/bwfmvar.h Wed Jul 22 17:21:25 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bwfmvar.h,v 1.10 2020/05/30 15:55:47 jdolecek Exp $ */
+/* $NetBSD: bwfmvar.h,v 1.11 2020/07/22 17:21:25 riastradh Exp $ */
/* $OpenBSD: bwfmvar.h,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -17,8 +17,25 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifndef _DEV_IC_BWFMVAR_H
+#define _DEV_IC_BWFMVAR_H
+
+#include <sys/types.h>
+
+#include <sys/cdefs.h>
+#include <sys/device_if.h>
#include <sys/pcq.h>
-#include <dev/firmload.h>
+#include <sys/queue.h>
+#include <sys/workqueue.h>
+
+#include <net/if_ether.h>
+
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_proto.h>
+#include <net80211/ieee80211_var.h>
+
+struct ieee80211_key;
+struct mbuf;
/* Chipcommon Core Chip IDs */
#define BRCM_CC_43143_CHIP_ID 43143
@@ -245,3 +262,5 @@ void bwfm_firmware_close(struct bwfm_fir
void * bwfm_firmware_data(struct bwfm_firmware_context *,
unsigned int, size_t *);
const char *bwfm_firmware_description(unsigned int);
+
+#endif /* _DEV_IC_BWFMVAR_H */
