[src/trunk]: src/sys/arch/i386/stand/lib - Remove support for gcc < 2.7.x. No...

[junyoung <junyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a82c8f9d90f
branches:  trunk
changeset: 582002:1a82c8f9d90f
user:      junyoung <junyoung%NetBSD.org@localhost>
date:      Mon Jun 13 11:33:02 2005 +0000

description:
- Remove support for gcc < 2.7.x. Nobody is using such an old version
  these days.
- s/u_int/uint/
- De-__P()

diffstat:

 sys/arch/i386/stand/lib/biosdisk_ll.h |  56 +++++++++++++++--------------------
 1 files changed, 24 insertions(+), 32 deletions(-)

diffs (104 lines):

diff -r d9dcb602b4cd -r 1a82c8f9d90f sys/arch/i386/stand/lib/biosdisk_ll.h
--- a/sys/arch/i386/stand/lib/biosdisk_ll.h     Mon Jun 13 11:27:40 2005 +0000
+++ b/sys/arch/i386/stand/lib/biosdisk_ll.h     Mon Jun 13 11:33:02 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: biosdisk_ll.h,v 1.8 2003/04/16 12:43:45 dsl Exp $       */
+/*     $NetBSD: biosdisk_ll.h,v 1.9 2005/06/13 11:33:02 junyoung Exp $  */
 
 /*
  * Copyright (c) 1996
@@ -52,10 +52,6 @@
 };
 #define        BIOSDISK_EXT13  1               /* BIOS supports int13 extension */
 
-#if __GNUC__ == 2 && __GNUC_MINOR__ < 7
-#pragma pack(1)
-#endif
-
 /*
  * Version 1.x drive parameters from int13 extensions
  * - should be supported by every BIOS that supports the extensions.
@@ -64,39 +60,39 @@
  */
 
 struct biosdisk_ext13info {
-       u_int16_t       size;           /* size of buffer, set on call */
-       u_int16_t       flags;          /* flags, see below */
-       u_int32_t       cyl;            /* # of physical cylinders */
-       u_int32_t       head;           /* # of physical heads */
-       u_int32_t       sec;            /* # of physical sectors per track */
-       u_int64_t       totsec;         /* total number of sectors */
-       u_int16_t       sbytes;         /* # of bytes per sector */
+       uint16_t        size;           /* size of buffer, set on call */
+       uint16_t        flags;          /* flags, see below */
+       uint32_t        cyl;            /* # of physical cylinders */
+       uint32_t        head;           /* # of physical heads */
+       uint32_t        sec;            /* # of physical sectors per track */
+       uint64_t        totsec;         /* total number of sectors */
+       uint16_t        sbytes;         /* # of bytes per sector */
 #if defined(BIOSDISK_EXT13INFO_V2) || defined(BIOSDISK_EXT13INFO_V3)
        /* v2.0 extensions */
-       u_int32_t       edd_cfg;        /* EDD configuration parameters */
+       uint32_t        edd_cfg;        /* EDD configuration parameters */
 #if defined(BIOSDISK_EXT13INFO_V3)
        /* v3.0 extensions */
-       u_int16_t       devpath_sig;    /* 0xbedd if path info present */
+       uint16_t        devpath_sig;    /* 0xbedd if path info present */
 #define EXT13_DEVPATH_SIGNATURE        0xbedd
-       u_int8_t        devpath_len;    /* length from devpath_sig */
-       u_int8_t        fill21[3];
+       uint8_t devpath_len;    /* length from devpath_sig */
+       uint8_t fill21[3];
        char            host_bus[4];    /* Probably "ISA" or "PCI" */
        char            iface_type[8];  /* "ATA", "ATAPI", "SCSI" etc */
        union {
-               u_int8_t        ip_8[8];
-               u_int16_t       ip_16[4];
-               u_int32_t       ip_32[2];
-               u_int64_t       ip_64[1];
+               uint8_t         ip_8[8];
+               uint16_t        ip_16[4];
+               uint32_t        ip_32[2];
+               uint64_t        ip_64[1];
        } interface_path;
 #define        ip_isa_iobase   ip_16[0];       /* iobase for ISA bus */
 #define        ip_pci_bus      ip_8[0];        /* PCI bus number */
 #define        ip_pci_device   ip_8[1];        /* PCI device number */
 #define        ip_pci_function ip_8[2];        /* PCI function number */
        union {
-               u_int8_t        dp_8[8];
-               u_int16_t       dp_16[4];
-               u_int32_t       dp_32[2];
-               u_int64_t       dp_64[1];
+               uint8_t         dp_8[8];
+               uint16_t        dp_16[4];
+               uint32_t        dp_32[2];
+               uint64_t        dp_64[1];
        } device_path;
 #define        dp_ata_slave    dp_8[0];
 #define        dp_atapi_slave  dp_8[0];
@@ -104,8 +100,8 @@
 #define        dp_scsi_lun     dp_8[0];
 #define        dp_firewire_guid dp_64[0];
 #define        dp_fibrechnl_wwn dp_64[0];
-       u_int8_t                fill40[1];
-       u_int8_t                checksum;       /* byte sum from dev_path_sig is 0 */
+       uint8_t         fill40[1];
+       uint8_t         checksum;       /* byte sum from dev_path_sig is 0 */
 #endif /* BIOSDISK_EXT13INFO_V3 */
 #endif /* BIOSDISK_EXT13INFO_V2 */
 } __attribute__((packed));
@@ -118,11 +114,7 @@
 #define EXT13_LOCKABLE         0x0020  /* device is lockable */
 #define EXT13_MAXGEOM          0x0040  /* geometry set to max; no media */
 
-#if __GNUC__ == 2 && __GNUC_MINOR__ < 7
-#pragma pack(4)
-#endif
-
 #define BIOSDISK_SECSIZE 512
 
-int set_geometry __P((struct biosdisk_ll *, struct biosdisk_ext13info *));
-int readsects   __P((struct biosdisk_ll *, daddr_t, int, char *, int));
+int set_geometry(struct biosdisk_ll *, struct biosdisk_ext13info *);
+int readsects(struct biosdisk_ll *, daddr_t, int, char *, int);