Date: Wed, 6 Aug 2014 01:38:02 GMT From: astarasikov@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271978 - soc2014/astarasikov/head/sys/arm/goldfish Message-ID: <201408060138.s761c28J015918@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: astarasikov Date: Wed Aug 6 01:38:02 2014 New Revision: 271978 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271978 Log: [goldfish]: uncomment error handling in FB driver Modified: soc2014/astarasikov/head/sys/arm/goldfish/goldfish_fb.c Modified: soc2014/astarasikov/head/sys/arm/goldfish/goldfish_fb.c ============================================================================== --- soc2014/astarasikov/head/sys/arm/goldfish/goldfish_fb.c Wed Aug 6 01:36:48 2014 (r271977) +++ soc2014/astarasikov/head/sys/arm/goldfish/goldfish_fb.c Wed Aug 6 01:38:02 2014 (r271978) @@ -164,10 +164,10 @@ int li_rid = 0, irq_rid = 0; size_t fbmem_size = 0; uint32_t format = 0; - + if (fb_softc) return (ENXIO); - + sc->li_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &li_rid, RF_ACTIVE); if (!sc->li_res) goto fail; @@ -183,7 +183,7 @@ sc->li_bst = rman_get_bustag(sc->li_res); sc->li_bsh = rman_get_bushandle(sc->li_res); fb_softc = sc; - + format = fb_read_4(GOLDFISH_FB_FORMAT); if (format != HAL_PIXEL_FORMAT_RGB_565) { device_printf(dev, "unsupported pixel format %d\n", format); @@ -213,7 +213,7 @@ if (err) { device_printf(dev, "failed to attach syscons\n"); TT; - //goto fail; + goto fail; } #endif @@ -225,6 +225,7 @@ return (0); fail: + printf("%s: failed\n", __func__); if (sc->irq_res) bus_release_resource(dev, SYS_RES_IRQ, irq_rid, sc->irq_res); @@ -678,7 +679,6 @@ static int dummy_kbd_configure(int flags) { - printf("%s:\n", __func__); return (0); } KEYBOARD_DRIVER(goldfish_dummy, goldfish_dummysw, dummy_kbd_configure);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408060138.s761c28J015918>