From owner-svn-soc-all@FreeBSD.ORG Wed Aug 6 01:38:03 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C6FEC31 for ; Wed, 6 Aug 2014 01:38:03 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDB6C2641 for ; Wed, 6 Aug 2014 01:38:02 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s761c29A015920 for ; Wed, 6 Aug 2014 01:38:02 GMT (envelope-from astarasikov@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s761c28J015918 for svn-soc-all@FreeBSD.org; Wed, 6 Aug 2014 01:38:02 GMT (envelope-from astarasikov@FreeBSD.org) Date: Wed, 6 Aug 2014 01:38:02 GMT Message-Id: <201408060138.s761c28J015918@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to astarasikov@FreeBSD.org using -f From: astarasikov@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271978 - soc2014/astarasikov/head/sys/arm/goldfish MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 01:38:03 -0000 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);