svn commit: r282398 - head/sys/dev/wpi
Adrian Chadd
adrian at FreeBSD.org
Sun May 3 23:37:14 UTC 2015
Author: adrian
Date: Sun May 3 23:37:13 2015
New Revision: 282398
URL: https://svnweb.freebsd.org/changeset/base/282398
Log:
Fix warning about comparison of integers of different signs.
PR: kern/197143
Submitted by: Andriy Voskoboinyk <s3erios at gmail.com>
Modified:
head/sys/dev/wpi/if_wpi.c
head/sys/dev/wpi/if_wpi_debug.h
Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c Sun May 3 23:36:25 2015 (r282397)
+++ head/sys/dev/wpi/if_wpi.c Sun May 3 23:37:13 2015 (r282398)
@@ -2080,7 +2080,7 @@ wpi_notif_intr(struct wpi_softc *sc)
bus_dmamap_sync(sc->shared_dma.tag, sc->shared_dma.map,
BUS_DMASYNC_POSTREAD);
- hw = le32toh(sc->shared->next);
+ hw = le32toh(sc->shared->next) & 0xfff;
hw = (hw == 0) ? WPI_RX_RING_COUNT - 1 : hw - 1;
while (sc->rxq.cur != hw) {
@@ -2305,7 +2305,7 @@ wpi_wakeup_intr(struct wpi_softc *sc)
static void
wpi_debug_registers(struct wpi_softc *sc)
{
- int i;
+ size_t i;
static const uint32_t csr_tbl[] = {
WPI_HW_IF_CONFIG,
WPI_INT,
Modified: head/sys/dev/wpi/if_wpi_debug.h
==============================================================================
--- head/sys/dev/wpi/if_wpi_debug.h Sun May 3 23:36:25 2015 (r282397)
+++ head/sys/dev/wpi/if_wpi_debug.h Sun May 3 23:37:13 2015 (r282398)
@@ -99,7 +99,7 @@ static const char *wpi_cmd_str(int cmd)
/*
* Translate CSR code to string
*/
-static const char *wpi_get_csr_string(int csr)
+static const char *wpi_get_csr_string(size_t csr)
{
switch (csr) {
WPI_DESC(WPI_HW_IF_CONFIG);
@@ -123,7 +123,7 @@ static const char *wpi_get_csr_string(in
}
}
-static const char *wpi_get_prph_string(int prph)
+static const char *wpi_get_prph_string(size_t prph)
{
switch (prph) {
WPI_DESC(WPI_APMG_CLK_CTRL);
More information about the svn-src-head
mailing list