Complete the removal of __FreeBSD_version checks from the amr driver. The
driver had advanced enough over the years that direct sharing of code with FreeBSD 4.x was in no way possible anymore.
This commit is contained in:
Scott Long
parent
2069c3305d
commit
9cf8dd43cf
@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
|
||||
#include <dev/amr/amr_compat.h>
|
||||
#include <sys/bio.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/stat.h>
|
||||
@ -929,7 +929,7 @@ amr_bio_command(struct amr_softc *sc, struct amr_command **acp)
|
||||
ac->ac_bio = bio;
|
||||
ac->ac_data = bio->bio_data;
|
||||
ac->ac_length = bio->bio_bcount;
|
||||
if (BIO_IS_READ(bio)) {
|
||||
if (bio->bio_cmd == BIO_READ) {
|
||||
ac->ac_flags |= AMR_CMD_DATAIN;
|
||||
cmd = AMR_CMD_LREAD;
|
||||
} else {
|
||||
|
||||
@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
|
||||
#include <dev/amr/amr_compat.h>
|
||||
#include <sys/bio.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
@ -1,108 +0,0 @@
|
||||
/*-
|
||||
* Copyright (c) 2000 Michael Smith
|
||||
* Copyright (c) 2000 BSDi
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* Copyright (c) 2002 Eric Moore
|
||||
* Copyright (c) 2002 LSI Logic Corporation
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The party using or redistributing the source code and binary forms
|
||||
* agrees to the disclaimer below and the terms and conditions set forth
|
||||
* herein.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
/*
|
||||
* Backwards compatibility support.
|
||||
*/
|
||||
|
||||
#if __FreeBSD_version < 500003 /* old buf style */
|
||||
# include <sys/buf.h>
|
||||
# include <machine/clock.h>
|
||||
# define INTR_ENTROPY 0
|
||||
|
||||
# define FREEBSD_4
|
||||
# define bio buf
|
||||
# define bioq_init(x) bufq_init(x)
|
||||
# define bioq_insert_tail(x, y) bufq_insert_tail(x, y)
|
||||
# define bioq_remove(x, y) bufq_remove(x, y)
|
||||
# define bioq_first(x) bufq_first(x)
|
||||
# define bio_queue_head buf_queue_head
|
||||
# define bio_bcount b_bcount
|
||||
# define bio_blkno b_blkno
|
||||
# define bio_caller1 b_caller1
|
||||
# define bio_data b_data
|
||||
# define bio_dev b_dev
|
||||
# define bio_driver1 b_driver1
|
||||
# define bio_driver2 b_driver2
|
||||
# define bio_error b_error
|
||||
# define bio_flags b_flags
|
||||
# define bio_pblkno b_pblkno
|
||||
# define bio_resid b_resid
|
||||
# define BIO_ERROR B_ERROR
|
||||
# define devstat_end_transaction_bio(x, y) devstat_end_transaction_buf(x, y)
|
||||
# define BIO_IS_READ(x) ((x)->b_flags & B_READ)
|
||||
# define AMR_BIO_FINISH(x) devstat_end_transaction_bio(&sc->amrd_stats, x);\
|
||||
biodone(x)
|
||||
|
||||
#else
|
||||
# include <sys/bio.h>
|
||||
# define BIO_IS_READ(x) ((x)->bio_cmd == BIO_READ)
|
||||
# define AMR_BIO_FINISH(x) biodone(x)
|
||||
#endif
|
||||
|
||||
/************************************************************************
|
||||
* Compatibility with older versions of FreeBSD
|
||||
*/
|
||||
#if __FreeBSD_version < 440001
|
||||
typedef struct proc d_thread_t;
|
||||
#define M_ZERO 0x0008 /* bzero the allocation */
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef __packed
|
||||
#define __packed __attribute__ ((packed))
|
||||
#endif
|
||||
@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/module.h>
|
||||
|
||||
#include <dev/amr/amr_compat.h>
|
||||
#include <sys/bio.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/conf.h>
|
||||
|
||||
@ -196,7 +196,7 @@ amrd_intr(void *data)
|
||||
bio->bio_resid = 0;
|
||||
}
|
||||
|
||||
AMR_BIO_FINISH(bio);
|
||||
biodone(bio);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/module.h>
|
||||
|
||||
#include <dev/amr/amr_compat.h>
|
||||
#include <sys/bio.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/conf.h>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user