From owner-p4-projects@FreeBSD.ORG Sat Feb 19 02:35:26 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B92B16A4D0; Sat, 19 Feb 2005 02:35:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 663A216A4CE for ; Sat, 19 Feb 2005 02:35:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C21B43D53 for ; Sat, 19 Feb 2005 02:35:26 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1J2ZQKZ071991 for ; Sat, 19 Feb 2005 02:35:26 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1J2ZP32071988 for perforce@freebsd.org; Sat, 19 Feb 2005 02:35:25 GMT (envelope-from scottl@freebsd.org) Date: Sat, 19 Feb 2005 02:35:25 GMT Message-Id: <200502190235.j1J2ZP32071988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 71280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2005 02:35:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=71280 Change 71280 by scottl@scottl-junior on 2005/02/19 02:34:42 IFC rev 1.143 of cam_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.142 2004/07/15 08:25:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.143 2004/10/05 04:22:20 scottl Exp $"); #include #include @@ -470,7 +470,6 @@ /* Queues for our software interrupt handler */ typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t; static cam_isrq_t cam_bioq; -static cam_isrq_t cam_netq; /* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */ static SLIST_HEAD(,ccb_hdr) ccb_freeq; @@ -523,7 +522,6 @@ #endif /* Pointers to software interrupt handlers */ -static void *camnet_ih; static void *cambio_ih; #if defined(CAM_DEBUG_FLAGS) && !defined(CAMDEBUG) @@ -1205,7 +1203,6 @@ TAILQ_INIT(&xpt_busses); TAILQ_INIT(&cam_bioq); - TAILQ_INIT(&cam_netq); SLIST_INIT(&ccb_freeq); STAILQ_INIT(&highpowerq); @@ -1272,7 +1269,6 @@ } /* Install our software interrupt handlers */ - swi_add(NULL, "camnet", camisr, &cam_netq, SWI_CAMNET, 0, &camnet_ih); swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, 0, &cambio_ih); } @@ -3453,7 +3449,6 @@ && (--timeout > 0)) { DELAY(1000); (*(sim->sim_poll))(sim); - camisr(&cam_netq); camisr(&cam_bioq); } @@ -3464,7 +3459,6 @@ xpt_action(start_ccb); while(--timeout > 0) { (*(sim->sim_poll))(sim); - camisr(&cam_netq); camisr(&cam_bioq); if ((start_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) @@ -4681,12 +4675,9 @@ done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; swi_sched(cambio_ih, 0); break; - case CAM_PERIPH_NET: - TAILQ_INSERT_TAIL(&cam_netq, &done_ccb->ccb_h, - sim_links.tqe); - done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX; - swi_sched(camnet_ih, 0); - break; + default: + panic("unknown periph type %d", + done_ccb->ccb_h.path->periph->type); } } splx(s);