From owner-svn-src-head@FreeBSD.ORG Sat Nov 22 14:59:51 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0856025F; Sat, 22 Nov 2014 14:59:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF430AED; Sat, 22 Nov 2014 14:59:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAMExoIl012008; Sat, 22 Nov 2014 14:59:50 GMT (envelope-from smh@FreeBSD.org) Received: (from smh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAMExoJj012007; Sat, 22 Nov 2014 14:59:50 GMT (envelope-from smh@FreeBSD.org) Message-Id: <201411221459.sAMExoJj012007@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: smh set sender to smh@FreeBSD.org using -f From: Steven Hartland Date: Sat, 22 Nov 2014 14:59:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274852 - head/sys/dev/asr X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 14:59:51 -0000 Author: smh Date: Sat Nov 22 14:59:50 2014 New Revision: 274852 URL: https://svnweb.freebsd.org/changeset/base/274852 Log: Fix build with asr driver This was broken by r274819 as asr is not in GENERIC because its not 64bit safe. MFC after: 1 month X-MFC-With: r274819 Sponsored by: Multiplay Modified: head/sys/dev/asr/asr.c Modified: head/sys/dev/asr/asr.c ============================================================================== --- head/sys/dev/asr/asr.c Sat Nov 22 14:53:50 2014 (r274851) +++ head/sys/dev/asr/asr.c Sat Nov 22 14:59:50 2014 (r274852) @@ -384,26 +384,6 @@ typedef struct Asr_softc { static STAILQ_HEAD(, Asr_softc) Asr_softc_list = STAILQ_HEAD_INITIALIZER(Asr_softc_list); - -static __inline void -set_ccb_timeout_ch(union asr_ccb *ccb) -{ - struct callout_handle ch; - - ch = timeout(asr_timeout, (caddr_t)ccb, - (int)((u_int64_t)(ccb->ccb_h.timeout) * (u_int32_t)hz / 1000)); - ccb->ccb_h.sim_priv.entries[0].ptr = ch.callout; -} - -static __inline struct callout_handle -get_ccb_timeout_ch(union asr_ccb *ccb) -{ - struct callout_handle ch; - - ch.callout = ccb->ccb_h.sim_priv.entries[0].ptr; - return ch; -} - /* * Prototypes of the routines we have in this object. */ @@ -426,6 +406,25 @@ static void asr_action(struct cam_sim *s static void asr_poll(struct cam_sim *sim); static int ASR_queue(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message); +static __inline void +set_ccb_timeout_ch(union asr_ccb *ccb) +{ + struct callout_handle ch; + + ch = timeout(asr_timeout, (caddr_t)ccb, + (int)((u_int64_t)(ccb->ccb_h.timeout) * (u_int32_t)hz / 1000)); + ccb->ccb_h.sim_priv.entries[0].ptr = ch.callout; +} + +static __inline struct callout_handle +get_ccb_timeout_ch(union asr_ccb *ccb) +{ + struct callout_handle ch; + + ch.callout = ccb->ccb_h.sim_priv.entries[0].ptr; + return ch; +} + /* * Here is the auto-probe structure used to nest our tests appropriately * during the startup phase of the operating system.