Module Name: src
Committed By: skrll
Date: Wed Dec 18 12:54:01 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omapfb.c
Log Message:
Deal with unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/omap/omapfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/omapfb.c
diff -u src/sys/arch/arm/omap/omapfb.c:1.24 src/sys/arch/arm/omap/omapfb.c:1.25
--- src/sys/arch/arm/omap/omapfb.c:1.24 Sun Jun 9 05:52:04 2013
+++ src/sys/arch/arm/omap/omapfb.c Wed Dec 18 12:54:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omapfb.c,v 1.24 2013/06/09 05:52:04 kiyohara Exp $ */
+/* $NetBSD: omapfb.c,v 1.25 2013/12/18 12:54:01 skrll Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.24 2013/06/09 05:52:04 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.25 2013/12/18 12:54:01 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -189,7 +189,7 @@ omapfb_attach(device_t parent, device_t
unsigned long defattr;
bool is_console = false;
uint32_t sz, reg;
- int segs, i, j, adr;
+ int segs, i, j;
sc->sc_iot = obio->obio_iot;
sc->sc_dev = self;
@@ -378,9 +378,9 @@ omapfb_attach(device_t parent, device_t
OMAP_DSSCTRL_DAC_DEMEN);
#endif
- /* VENC to NTSC mode */
- adr = OMAPFB_VENC_F_CONTROL;
#if 0
+ /* VENC to NTSC mode */
+ int adr = OMAPFB_VENC_F_CONTROL;
for (i = 0; i < __arraycount(venc_mode_ntsc); i++) {
bus_space_write_4(sc->sc_iot, sc->sc_regh, adr,
venc_mode_ntsc[i]);
@@ -981,10 +981,8 @@ omapfb_cursor(void *cookie, int on, int
struct rasops_info *ri = cookie;
struct vcons_screen *scr = ri->ri_hw;
struct omapfb_softc *sc = scr->scr_cookie;
- int wi, he, pos;
+ int pos;
- wi = ri->ri_font->fontwidth;
- he = ri->ri_font->fontheight;
pos = col + row * ri->ri_cols;
#ifdef WSDISPLAY_SCROLLSUPPORT
pos += scr->scr_offset_to_zero;
