Update to RC245.

Change-Id: Icef02ec5b4e01769bbd3fd2dcc4fb1913bc418d1

5 files changed, 40 insertions, 18 deletions

diff --git a/bcm4329/src/dhd/sys/dhd_linux.c b/bcm4329/src/dhd/sys/dhd_linux.c
index f1ddba4..4b8b8b3 100644
--- a/bcm4329/src/dhd/sys/dhd_linux.c
+++ b/bcm4329/src/dhd/sys/dhd_linux.c
@@ -22,7 +22,7 @@
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: dhd_linux.c,v 1.65.4.9.2.12.2.87 2010/06/23 00:14:28 Exp $
+ * $Id: dhd_linux.c,v 1.65.4.9.2.12.2.89 2010/07/21 18:07:11 Exp $
  */
 
 #ifdef CONFIG_WIFI_CONTROL_FUNC
@@ -2752,8 +2752,10 @@ dhd_wl_host_event(dhd_info_t *dhd, int *ifidx, void *pktdata,
 
 #if defined(CONFIG_WIRELESS_EXT)
 	ASSERT(dhd->iflist[*ifidx] != NULL);
+	ASSERT(dhd->iflist[*ifidx]->net != NULL);
 
-	wl_iw_event(dhd->iflist[*ifidx]->net, event, *data);
+	if (dhd->iflist[*ifidx]->net)
+		wl_iw_event(dhd->iflist[*ifidx]->net, event, *data);
 #endif /* defined(CONFIG_WIRELESS_EXT)  */
 
 
diff --git a/bcm4329/src/include/epivers.h b/bcm4329/src/include/epivers.h
index 42704f0..114c735 100644
--- a/bcm4329/src/include/epivers.h
+++ b/bcm4329/src/include/epivers.h
@@ -31,18 +31,18 @@
 
 #define	EPI_MINOR_VERSION	218
 
-#define	EPI_RC_NUMBER		243
+#define	EPI_RC_NUMBER		245
 
 #define	EPI_INCREMENTAL_NUMBER	0
 
 #define	EPI_BUILD_NUMBER	0
 
-#define	EPI_VERSION		4, 218, 243, 0
+#define	EPI_VERSION		4, 218, 245, 0
 
-#define	EPI_VERSION_NUM		0x04daf300
+#define	EPI_VERSION_NUM		0x04daf500
 
 
-#define	EPI_VERSION_STR		"4.218.243.0"
-#define	EPI_ROUTER_VERSION_STR	"4.219.243.0"
+#define	EPI_VERSION_STR		"4.218.245.0"
+#define	EPI_ROUTER_VERSION_STR	"4.219.245.0"
 
 #endif 
diff --git a/bcm4329/src/include/hndrte_armtrap.h b/bcm4329/src/include/hndrte_armtrap.h
index 5140901..ca3281b 100644
--- a/bcm4329/src/include/hndrte_armtrap.h
+++ b/bcm4329/src/include/hndrte_armtrap.h
@@ -2,13 +2,13 @@
  * HNDRTE arm trap handling.
  *
  * Copyright (C) 1999-2010, Broadcom Corporation
- *
+ * 
  *      Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2 (the "GPL"),
  * available at http://www.broadcom.com/licenses/GPLv2.php, with the
  * following added to such license:
- *
+ * 
  *      As a special exception, the copyright holders of this software give you
  * permission to link this software with independent modules, and to copy and
  * distribute the resulting executable under terms of your choice, provided that
@@ -16,12 +16,12 @@
  * the license of that module.  An independent module is a module which is not
  * derived from this software.  The special exception does not apply to any
  * modifications of the software.
- *
+ * 
  *      Notwithstanding the above, under no circumstances may you combine this
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: hndrte_armtrap.h,v 13.3.196.1 2009/07/13 23:35:44 Exp $
+ * $Id: hndrte_armtrap.h,v 13.3.196.2 2010/07/15 19:06:11 Exp $
  */
 
 #ifndef	_hndrte_armtrap_h
diff --git a/bcm4329/src/include/hndrte_cons.h b/bcm4329/src/include/hndrte_cons.h
index f2334a0..a424174 100755..100644
--- a/bcm4329/src/include/hndrte_cons.h
+++ b/bcm4329/src/include/hndrte_cons.h
@@ -1,12 +1,14 @@
 /*
- * Copyright (C) 1999-2010, Broadcom Corporation
+ * Console support for hndrte.
  *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
  *      Unless you and Broadcom execute a separate written software license
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2 (the "GPL"),
  * available at http://www.broadcom.com/licenses/GPLv2.php, with the
  * following added to such license:
- *
+ * 
  *      As a special exception, the copyright holders of this software give you
  * permission to link this software with independent modules, and to copy and
  * distribute the resulting executable under terms of your choice, provided that
@@ -14,30 +16,48 @@
  * the license of that module.  An independent module is a module which is not
  * derived from this software.  The special exception does not apply to any
  * modifications of the software.
- *
+ * 
  *      Notwithstanding the above, under no circumstances may you combine this
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: hndrte_cons.h,v 13.1.2.3 2010/02/18 01:09:39 Exp $
+ * $Id: hndrte_cons.h,v 13.1.2.4 2010/07/15 19:06:11 Exp $
  */
 
 #include <typedefs.h>
 
 #define CBUF_LEN	(128)
+
 #define LOG_BUF_LEN	1024
 
 typedef struct {
-	uint32		buf;
+	uint32		buf;		/* Can't be pointer on (64-bit) hosts */
 	uint		buf_size;
 	uint		idx;
-	char		*_buf_compat;
+	char		*_buf_compat;	/* Redundant pointer for backward compat. */
 } hndrte_log_t;
 
 typedef struct {
+	/* Virtual UART
+	 *   When there is no UART (e.g. Quickturn), the host should write a complete
+	 *   input line directly into cbuf and then write the length into vcons_in.
+	 *   This may also be used when there is a real UART (at risk of conflicting with
+	 *   the real UART).  vcons_out is currently unused.
+	 */
 	volatile uint	vcons_in;
 	volatile uint	vcons_out;
+
+	/* Output (logging) buffer
+	 *   Console output is written to a ring buffer log_buf at index log_idx.
+	 *   The host may read the output when it sees log_idx advance.
+	 *   Output will be lost if the output wraps around faster than the host polls.
+	 */
 	hndrte_log_t	log;
+
+	/* Console input line buffer
+	 *   Characters are read one at a time into cbuf until <CR> is received, then
+	 *   the buffer is processed as a command line.  Also used for virtual UART.
+	 */
 	uint		cbuf_idx;
 	char		cbuf[CBUF_LEN];
 } hndrte_cons_t;
diff --git a/bcm4329/src/shared/hndpmu.c b/bcm4329/src/shared/hndpmu.c
index 6d5c47a..307347a 100644
--- a/bcm4329/src/shared/hndpmu.c
+++ b/bcm4329/src/shared/hndpmu.c
@@ -22,7 +22,7 @@
  * software in any way with any other Broadcom software provided under a license
  * other than the GPL, without Broadcom's express prior written consent.
  *
- * $Id: hndpmu.c,v 1.95.2.17.4.11.2.62 2010/04/09 13:49:07 Exp $
+ * $Id: hndpmu.c,v 1.95.2.17.4.11.2.63 2010/07/21 13:55:09 Exp $
  */
 
 #include <typedefs.h>