From owner-svn-src-all@FreeBSD.ORG Tue Jul 30 16:17:31 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 677B5DFD; Tue, 30 Jul 2013 16:17:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 54C812D3E; Tue, 30 Jul 2013 16:17:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6UGHVaV078510; Tue, 30 Jul 2013 16:17:31 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6UGHVds078509; Tue, 30 Jul 2013 16:17:31 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201307301617.r6UGHVds078509@svn.freebsd.org> From: Rui Paulo Date: Tue, 30 Jul 2013 16:17:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253807 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jul 2013 16:17:31 -0000 Author: rpaulo Date: Tue Jul 30 16:17:30 2013 New Revision: 253807 URL: http://svnweb.freebsd.org/changeset/base/253807 Log: Unbreak sparc64 LINT. Need to fix this correctly at some point in the future. Modified: head/sys/dev/usb/wlan/if_rsu.c Modified: head/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- head/sys/dev/usb/wlan/if_rsu.c Tue Jul 30 14:50:44 2013 (r253806) +++ head/sys/dev/usb/wlan/if_rsu.c Tue Jul 30 16:17:30 2013 (r253807) @@ -2077,7 +2077,7 @@ rsu_power_off(struct rsu_softc *sc) } static int -rsu_fw_loadsection(struct rsu_softc *sc, uint8_t *buf, int len) +rsu_fw_loadsection(struct rsu_softc *sc, const uint8_t *buf, int len) { struct rsu_data *data; struct r92s_tx_desc *txd; @@ -2111,9 +2111,9 @@ rsu_fw_loadsection(struct rsu_softc *sc, static int rsu_load_firmware(struct rsu_softc *sc) { - struct r92s_fw_hdr *hdr; + const struct r92s_fw_hdr *hdr; struct r92s_fw_priv *dmem; - uint8_t *imem, *emem; + const uint8_t *imem, *emem; int imemsz, ememsz; const struct firmware *fw; size_t size; @@ -2136,7 +2136,7 @@ rsu_load_firmware(struct rsu_softc *sc) error = EINVAL; goto fail; } - hdr = (struct r92s_fw_hdr *)fw->data; + hdr = (const struct r92s_fw_hdr *)fw->data; if (hdr->signature != htole16(0x8712) && hdr->signature != htole16(0x8192)) { device_printf(sc->sc_dev, @@ -2163,7 +2163,7 @@ rsu_load_firmware(struct rsu_softc *sc) error = EINVAL; goto fail; } - imem = (uint8_t *)&hdr[1]; + imem = (const uint8_t *)&hdr[1]; emem = imem + imemsz; /* Load IMEM section. */ @@ -2238,7 +2238,7 @@ rsu_load_firmware(struct rsu_softc *sc) } /* Update DMEM section before loading. */ - dmem = &hdr->priv; + dmem = __DECONST(struct r92s_fw_priv *, &hdr->priv); memset(dmem, 0, sizeof(*dmem)); dmem->hci_sel = R92S_HCI_SEL_USB | R92S_HCI_SEL_8172; dmem->nendpoints = sc->npipes;