From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 17:50:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1679A16A421; Wed,  2 Jan 2008 17:50:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC15516A41B
	for <perforce@FreeBSD.org>; Wed,  2 Jan 2008 17:50:04 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BA45213C465
	for <perforce@FreeBSD.org>; Wed,  2 Jan 2008 17:50:04 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m02Ho4M7068942
	for <perforce@FreeBSD.org>; Wed, 2 Jan 2008 17:50:04 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m02Ho42p068939
	for perforce@freebsd.org; Wed, 2 Jan 2008 17:50:04 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 2 Jan 2008 17:50:04 GMT
Message-Id: <200801021750.m02Ho42p068939@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 132314 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jan 2008 17:50:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=132314

Change 132314 by hselasky@hselasky_laptop001 on 2008/01/02 17:49:59

	
	The if_zyd firmware should be static and
	constant. We de-const it using USBD_ADD_BYTES()
	before passing it to the loader.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_zydfw.h#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_zydfw.h#6 (text+ko) ====

@@ -26,7 +26,7 @@
 
 /*	$FreeBSD: src/sys/dev/usb/if_zydfw.h,v 1.2 2007/11/03 19:24:51 sam Exp $	*/
 
-uint8_t zd1211_firmware[] = {
+static const uint8_t zd1211_firmware[] = {
 	0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE,
 	0xD1, 0x94, 0x11, 0xEE, 0x88, 0xD4, 0xD1, 0x96,
 	0xD1, 0x98, 0x5C, 0x99, 0x5C, 0x99, 0x4C, 0x99,
@@ -672,9 +672,9 @@
 /*
  * current zd1211b firmware version.
  */
-#define ZD1211B_FIRMWARE_VER		4705
+#define	ZD1211B_FIRMWARE_VER		4705
 
-uint8_t zd1211b_firmware[] = {
+static const uint8_t zd1211b_firmware[] = {
 	0x08, 0x91, 0xff, 0xed, 0x09, 0x93, 0x1e, 0xee, 0xd1, 0x94, 0x11,
 	0xee, 0x88, 0xd4, 0xd1, 0x96, 0xd1, 0x98, 0x5c, 0x99, 0x5c, 0x99,
 	0x4c, 0x99, 0x04, 0x9d, 0xd1, 0x98, 0xd1, 0x9a, 0x03, 0xee, 0xf4,