From 4891334365b11be855307ff3375b9fa2b9508b16 Mon Sep 17 00:00:00 2001 From: kato Date: Sat, 24 Apr 1999 18:24:43 +0000 Subject: [PATCH] Changed the type of id_port from short into int to avoid wrong conversion from short to unsigned long which is an argument of bus_alloc_resource. Since the value -1 is used to indicate no port reousece, id_port need to be signed (suggested by Doug Rabson and Peter Wemm.) --- sys/amd64/isa/isa.c | 4 ++-- sys/i386/isa/isa.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index edd58c0257a7..3547800cd19b 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa.c,v 1.120 1999/04/16 23:39:15 peter Exp $ + * $Id: isa.c,v 1.121 1999/04/24 06:47:24 peter Exp $ */ /* @@ -75,7 +75,7 @@ MALLOC_DEFINE(M_ISADEV, "isadev", "ISA device"); * The structure used to attach devices to the isa bus. */ struct isa_device { - short id_port[ISA_NPORT_IVARS]; + int id_port[ISA_NPORT_IVARS]; u_short id_portsize[ISA_NPORT_IVARS]; vm_offset_t id_maddr[ISA_NMEM_IVARS]; vm_size_t id_msize[ISA_NMEM_IVARS]; diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index edd58c0257a7..3547800cd19b 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa.c,v 1.120 1999/04/16 23:39:15 peter Exp $ + * $Id: isa.c,v 1.121 1999/04/24 06:47:24 peter Exp $ */ /* @@ -75,7 +75,7 @@ MALLOC_DEFINE(M_ISADEV, "isadev", "ISA device"); * The structure used to attach devices to the isa bus. */ struct isa_device { - short id_port[ISA_NPORT_IVARS]; + int id_port[ISA_NPORT_IVARS]; u_short id_portsize[ISA_NPORT_IVARS]; vm_offset_t id_maddr[ISA_NMEM_IVARS]; vm_size_t id_msize[ISA_NMEM_IVARS];