From 49e526ab385f4a3b98c51482597b75853bbfcaeb Mon Sep 17 00:00:00 2001 From: scottl Date: Mon, 8 Aug 2005 12:16:21 +0000 Subject: 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. --- sys/dev/amr/amr.c | 4 +- sys/dev/amr/amr_cam.c | 2 +- sys/dev/amr/amr_compat.h | 108 ----------------------------------------------- sys/dev/amr/amr_disk.c | 4 +- sys/dev/amr/amr_pci.c | 2 +- 5 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 sys/dev/amr/amr_compat.h diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index 0f9c4e3..0cf3041 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include #include @@ -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 { diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c index 66e4b5b..9becb73 100644 --- a/sys/dev/amr/amr_cam.c +++ b/sys/dev/amr/amr_cam.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include #include diff --git a/sys/dev/amr/amr_compat.h b/sys/dev/amr/amr_compat.h deleted file mode 100644 index 33a09f0..0000000 --- a/sys/dev/amr/amr_compat.h +++ /dev/null @@ -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 -# include -# 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 -# 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 diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c index 164d419..a394dee 100644 --- a/sys/dev/amr/amr_disk.c +++ b/sys/dev/amr/amr_disk.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include @@ -196,7 +196,7 @@ amrd_intr(void *data) bio->bio_resid = 0; } - AMR_BIO_FINISH(bio); + biodone(bio); } static int diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index 0fdfd8c..c2c9f1b 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include #include -- cgit v1.1