Deleted Added
full compact
adv_pci.c (119690) adv_pci.c (127135)
1/*
2 * Device probe and attach routines for the following
3 * Advanced Systems Inc. SCSI controllers:
4 *
5 * Connectivity Products:
6 * ABP902/3902 - Bus-Master PCI (16 CDB)
7 * ABP3905 - Bus-Master PCI (16 CDB)
8 * ABP915 - Bus-Master PCI (16 CDB)

--- 45 unchanged lines hidden (view full) ---

54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 */
60
61#include <sys/cdefs.h>
1/*
2 * Device probe and attach routines for the following
3 * Advanced Systems Inc. SCSI controllers:
4 *
5 * Connectivity Products:
6 * ABP902/3902 - Bus-Master PCI (16 CDB)
7 * ABP3905 - Bus-Master PCI (16 CDB)
8 * ABP915 - Bus-Master PCI (16 CDB)

--- 45 unchanged lines hidden (view full) ---

54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE.
59 */
60
61#include <sys/cdefs.h>
62__FBSDID("$FreeBSD: head/sys/dev/advansys/adv_pci.c 119690 2003-09-02 17:30:40Z jhb $");
62__FBSDID("$FreeBSD: head/sys/dev/advansys/adv_pci.c 127135 2004-03-17 17:50:55Z njl $");
63
64#include <sys/param.h>
65#include <sys/systm.h>
66#include <sys/kernel.h>
67#include <sys/lock.h>
68#include <sys/mutex.h>
69
70#include <machine/bus_pio.h>

--- 93 unchanged lines hidden (view full) ---

164 * Early chips can't handle non-zero latency timer settings.
165 */
166 if (id == PCI_DEVICE_ID_ADVANSYS_1200A
167 || id == PCI_DEVICE_ID_ADVANSYS_1200B) {
168 pci_write_config(dev, PCIR_LATTIMER, /*value*/0, /*bytes*/1);
169 }
170
171 rid = PCI_BASEADR0;
63
64#include <sys/param.h>
65#include <sys/systm.h>
66#include <sys/kernel.h>
67#include <sys/lock.h>
68#include <sys/mutex.h>
69
70#include <machine/bus_pio.h>

--- 93 unchanged lines hidden (view full) ---

164 * Early chips can't handle non-zero latency timer settings.
165 */
166 if (id == PCI_DEVICE_ID_ADVANSYS_1200A
167 || id == PCI_DEVICE_ID_ADVANSYS_1200B) {
168 pci_write_config(dev, PCIR_LATTIMER, /*value*/0, /*bytes*/1);
169 }
170
171 rid = PCI_BASEADR0;
172 iores = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1,
173 RF_ACTIVE);
172 iores = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
173 RF_ACTIVE);
174 if (iores == NULL)
175 return ENXIO;
176
177 if (adv_find_signature(rman_get_bustag(iores),
178 rman_get_bushandle(iores)) == 0) {
179 bus_release_resource(dev, SYS_RES_IOPORT, rid, iores);
180 return ENXIO;
181 }

--- 119 unchanged lines hidden (view full) ---

301 if (id == PCI_DEVICE_ID_ADVANSYS_1200A
302 || id == PCI_DEVICE_ID_ADVANSYS_1200B) {
303 adv->bug_fix_control |= ADV_BUG_FIX_IF_NOT_DWB;
304 adv->bug_fix_control |= ADV_BUG_FIX_ASYN_USE_SYN;
305 adv->fix_asyn_xfer = ~0;
306 }
307
308 irqrid = 0;
174 if (iores == NULL)
175 return ENXIO;
176
177 if (adv_find_signature(rman_get_bustag(iores),
178 rman_get_bushandle(iores)) == 0) {
179 bus_release_resource(dev, SYS_RES_IOPORT, rid, iores);
180 return ENXIO;
181 }

--- 119 unchanged lines hidden (view full) ---

301 if (id == PCI_DEVICE_ID_ADVANSYS_1200A
302 || id == PCI_DEVICE_ID_ADVANSYS_1200B) {
303 adv->bug_fix_control |= ADV_BUG_FIX_IF_NOT_DWB;
304 adv->bug_fix_control |= ADV_BUG_FIX_ASYN_USE_SYN;
305 adv->fix_asyn_xfer = ~0;
306 }
307
308 irqrid = 0;
309 irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &irqrid, 0, ~0, 1,
310 RF_SHAREABLE | RF_ACTIVE);
309 irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &irqrid,
310 RF_SHAREABLE | RF_ACTIVE);
311 if (irqres == NULL ||
312 bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY, adv_intr, adv, &ih)) {
313 adv_free(adv);
314 bus_release_resource(dev, SYS_RES_IOPORT, rid, iores);
315 return ENXIO;
316 }
317
318 adv_attach(adv);

--- 16 unchanged lines hidden ---
311 if (irqres == NULL ||
312 bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY, adv_intr, adv, &ih)) {
313 adv_free(adv);
314 bus_release_resource(dev, SYS_RES_IOPORT, rid, iores);
315 return ENXIO;
316 }
317
318 adv_attach(adv);

--- 16 unchanged lines hidden ---