Attachment 154335 Details for Bug 197143 – Optimize sc->rev processing

[patch] Optimize sc->rev processing

patch-wpi28.diff (text/plain), 1.22 KB, created by Andriy Voskoboinyk on 2015-03-15 12:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-03-15 12:00:12 UTC

Size: 1.22 KB

patch

obsolete

>Index: sys/dev/wpi/if_wpi.c
>===================================================================
>--- sys/dev/wpi/if_wpi.c	(revision 279775)
>+++ sys/dev/wpi/if_wpi.c	(working copy)
>@@ -469,7 +469,7 @@
> 		device_printf(sc->sc_dev, "Hardware Type: %c\n",
> 		    sc->type > 1 ? 'B': '?');
> 		device_printf(sc->sc_dev, "Hardware Revision: %c\n",
>-		    ((le16toh(sc->rev) & 0xf0) == 0xd0) ? 'D': '?');
>+		    ((sc->rev & 0xf0) == 0xd0) ? 'D': '?');
> 		device_printf(sc->sc_dev, "SKU %s support 802.11a\n",
> 		    supportsa ? "does" : "does not");
> 
>@@ -1299,8 +1299,9 @@
> 	WPI_CHK(wpi_read_prom_data(sc, WPI_EEPROM_TYPE, &sc->type,
> 	    sizeof(sc->type)));
> 
>+	sc->rev = le16toh(sc->rev);
> 	DPRINTF(sc, WPI_DEBUG_EEPROM, "cap=%x rev=%x type=%x\n", sc->cap,
>-	    le16toh(sc->rev), sc->type);
>+	    sc->rev, sc->type);
> 
> 	/* Read the regulatory domain (4 ASCII characters.) */
> 	WPI_CHK(wpi_read_prom_data(sc, WPI_EEPROM_DOMAIN, sc->domain,
>@@ -4589,7 +4590,7 @@
> 	if (sc->cap == 0x80)
> 		WPI_SETBITS(sc, WPI_HW_IF_CONFIG, WPI_HW_IF_CONFIG_SKU_MRC);
> 
>-	if ((le16toh(sc->rev) & 0xf0) == 0xd0)
>+	if ((sc->rev & 0xf0) == 0xd0)
> 		WPI_SETBITS(sc, WPI_HW_IF_CONFIG, WPI_HW_IF_CONFIG_REV_D);
> 	else
> 		WPI_CLRBITS(sc, WPI_HW_IF_CONFIG, WPI_HW_IF_CONFIG_REV_D);

Actions: View | Diff

Attachments on bug 197143: 152282 | 152662 | 152977 | 153911 | 153977 | 153983 | 153985 | 153999 | 154000 | 154002 | 154006 | 154007 | 154009 | 154010 | 154011 | 154013 | 154015 | 154016 | 154017 | 154019 | 154020 | 154021 | 154022 | 154024 | 154026 | 154030 | 154032 | 154033 | 154328 | 154329 | 154330 | 154332 | 154334 | 154335 | 154336 | 154337 | 154338 | 154340 | 154341 | 154343 | 154346 | 154347 | 154348 | 154349 | 154350 | 154351 | 154352 | 154353 | 154354 | 154355 | 154356 | 154357 | 154358 | 154359 | 154360 | 154361 | 154362 | 154363 | 154364 | 154365 | 154366 | 154368 | 154369 | 154370 | 154371 | 154372 | 154373 | 154374 | 154375 | 154378 | 154379 | 154380 | 154381 | 154382 | 154383 | 154384 | 155332 | 155333 | 156164 | 156165 | 156166 | 156167 | 156168 | 156169 | 156170 | 156171 | 156172 | 156173 | 156174 | 156175 | 156176 | 156177 | 156178 | 156179 | 156180 | 156181 | 156182 | 156183 | 156184 | 156185 | 156186 | 156187 | 156188 | 156189 | 156190 | 156191 | 156192 | 156193 | 156194 | 156195