From owner-svn-soc-all@FreeBSD.ORG  Wed Aug  6 01:36:06 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6100BBEA
 for <svn-soc-all@FreeBSD.org>; Wed,  6 Aug 2014 01:36:06 +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 4DDCE2631
 for <svn-soc-all@FreeBSD.org>; Wed,  6 Aug 2014 01:36:06 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s761a64n015347
 for <svn-soc-all@FreeBSD.org>; Wed, 6 Aug 2014 01:36:06 GMT
 (envelope-from astarasikov@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s761a5KG015338
 for svn-soc-all@FreeBSD.org; Wed, 6 Aug 2014 01:36:05 GMT
 (envelope-from astarasikov@FreeBSD.org)
Date: Wed, 6 Aug 2014 01:36:05 GMT
Message-Id: <201408060136.s761a5KG015338@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: r271976 - 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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 01:36:06 -0000

Author: astarasikov
Date: Wed Aug  6 01:36:05 2014
New Revision: 271976
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271976

Log:
  [goldfish]: minor fixes in PIC
  

Modified:
  soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c

Modified: soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c
==============================================================================
--- soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c	Wed Aug  6 01:35:07 2014	(r271975)
+++ soc2014/astarasikov/head/sys/arm/goldfish/goldfish_pic.c	Wed Aug  6 01:36:05 2014	(r271976)
@@ -86,10 +86,10 @@
 {
 	struct goldfish_pic_softc *sc = device_get_softc(dev);
 	int rid = 0;
-	
+
 	if (intc_softc)
 		return (ENXIO);
-	
+
 	sc->li_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 
 	    RF_ACTIVE);
 	if (!sc->li_res)
@@ -119,11 +119,7 @@
 
 static devclass_t goldfish_pic_devclass;
 
-EARLY_DRIVER_MODULE(pic, simplebus, goldfish_pic_driver, goldfish_pic_devclass,
-	0, 0, BUS_PASS_INTERRUPT);
-EARLY_DRIVER_MODULE(pic, fdtbus, goldfish_pic_driver, goldfish_pic_devclass,
-	0, 0, BUS_PASS_INTERRUPT);
-//DRIVER_MODULE(pic, simplebus, goldfish_pic_driver, goldfish_pic_devclass, 0, 0);
+DRIVER_MODULE(pic, simplebus, goldfish_pic_driver, goldfish_pic_devclass, 0, 0);
 
 int
 arm_get_next_irq(int last)
@@ -132,7 +128,7 @@
 		return (-1);
 
 	int rc = intc_read_4(GOLDFISH_PIC_NUMBER);
-	if (rc >= 0)
+	if (rc > 0)
 		return (rc);
 
 	return (-1);