diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/patches/10_cdromlock.patch | 14 | ||||
| -rw-r--r-- | debian/patches/12_fixes_gcc-3.4.patch | 39 | ||||
| -rw-r--r-- | debian/patches/12_sis900.patch | 2168 | ||||
| -rw-r--r-- | debian/patches/14_disable_fpe.patch | 61 | ||||
| -rw-r--r-- | debian/patches/15_disable_qlogic_firmware.patch | 44 | ||||
| -rw-r--r-- | debian/patches/16_enable_debug.patch | 130 | ||||
| -rw-r--r-- | debian/patches/17_fix_double_free.patch | 122 | ||||
| -rw-r--r-- | debian/patches/18_linux_printk_buffer_overrun.patch | 87 | ||||
| -rw-r--r-- | debian/patches/19_cpu_detect.patch | 93 | ||||
| -rw-r--r-- | debian/patches/20_glue_block_assert.patch | 21 | ||||
| -rw-r--r-- | debian/patches/90_autoconf_autogen.patch | 1465 |
12 files changed, 2986 insertions, 1277 deletions
diff --git a/debian/changelog b/debian/changelog index a64ede7..c6668a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +gnumach (1:20050501-1) unstable; urgency=low + + * New upstream CVS snapshot. + - debian/patches/12_fixes_gcc-3.4.patch: Remove upstream integrated patch. + - debian/patches/14_disable_fpe.patch: Likewise. + - debian/patches/15_disable_qlogic_firmware.patch: Likewise. + - debian/patches/16_enable_debug.patch: Likewise. + - debian/patches/17_fix_double_free.patch: Likewise. + - debian/patches/18_linux_printk_buffer_overrun.patch: Likewise. + - debian/patches/19_cpu_detect.patch: Likewise. + - debian/patches/20_glue_block_assert.patch: Likewise. + - debian/patches/10_cdromlock.patch: Rediff. + - debian/patches/90_autoconf_autogen.patch: Regenerate. + * Add suport for SiS 900 NIC. + - debian/patches/12_sis900.patch: New file. + Thanks to Andreas B. Mundt <andi.mundt@web.de>. + + -- Guillem Jover <guillem@debian.org> Sun, 1 May 2005 19:26:39 +0300 + gnumach (1:20040915.dfsg.1-2) unstable; urgency=low * Fix a typo in natsemi driver enable command. (Closes: #293950) diff --git a/debian/patches/10_cdromlock.patch b/debian/patches/10_cdromlock.patch index de01b56..a86893e 100644 --- a/debian/patches/10_cdromlock.patch +++ b/debian/patches/10_cdromlock.patch @@ -2,7 +2,7 @@ --- gnumach-20040229.orig/linux/dev/glue/block.c +++ gnumach-20040229/linux/dev/glue/block.c -@@ -797,6 +797,7 @@ +@@ -789,6 +789,7 @@ extern struct device_emulation_ops linux_block_emulation_ops; static io_return_t device_close (void *); @@ -10,7 +10,7 @@ /* Return a send right for block device BD. */ static ipc_port_t -@@ -1172,6 +1173,7 @@ +@@ -1164,6 +1165,7 @@ { ipc_kobject_set (bd->port, IKO_NULL, IKOT_NONE); ipc_port_dealloc_kernel (bd->port); @@ -18,7 +18,7 @@ } kfree ((vm_offset_t) bd, sizeof (struct block_data)); bd = NULL; -@@ -1182,18 +1184,16 @@ +@@ -1174,18 +1176,16 @@ bd->open_count = 1; bd->next = open_list; open_list = bd; @@ -41,7 +41,7 @@ { struct block_data *bd = d, *bdp, **prev; struct device_struct *ds = bd->ds; -@@ -1210,7 +1210,7 @@ +@@ -1202,7 +1202,7 @@ } ds->busy = 1; @@ -50,7 +50,7 @@ { /* Wait for pending I/O to complete. */ while (bd->iocount > 0) -@@ -1253,6 +1253,13 @@ +@@ -1245,6 +1245,13 @@ return D_SUCCESS; } @@ -64,7 +64,7 @@ #define MAX_COPY (VM_MAP_COPY_PAGE_LIST_MAX << PAGE_SHIFT) /* Check block BN and size COUNT for I/O validity -@@ -1712,6 +1719,16 @@ +@@ -1704,6 +1711,16 @@ return D_SUCCESS; } @@ -81,7 +81,7 @@ struct device_emulation_ops linux_block_emulation_ops = { NULL, -@@ -1727,7 +1744,7 @@ +@@ -1719,7 +1736,7 @@ device_get_status, NULL, NULL, diff --git a/debian/patches/12_fixes_gcc-3.4.patch b/debian/patches/12_fixes_gcc-3.4.patch deleted file mode 100644 index f705552..0000000 --- a/debian/patches/12_fixes_gcc-3.4.patch +++ /dev/null @@ -1,39 +0,0 @@ -#DPATCHLEVEL=1 - -2005-01-10 Guillem Jover <guillem@hadrons.org> - - * linux/dev/include/linux/skbuff.h (skb_put, skb_push): Fix errors - for deprecated use of labels at end of compound statements. - * i386/i386/fpe_linkage.c (enable_fpe): Declare. - - -diff -Naur gnumach-20040229.orig/linux/dev/include/linux/skbuff.h gnumach-20040229/linux/dev/include/linux/skbuff.h ---- gnumach-20040229.orig/linux/dev/include/linux/skbuff.h 26 Apr 1999 05:48:00 -0000 1.1 -+++ gnumach-20040229/linux/dev/include/linux/skbuff.h 15 Sep 2004 12:52:34 -0000 -@@ -407,6 +407,7 @@ - __label__ here; - panic("skput:over: %p:%d", &&here,len); - here: -+ ; - } - return tmp; - } -@@ -420,6 +421,7 @@ - __label__ here; - panic("skpush:under: %p:%d", &&here,len); - here: -+ ; - } - return skb->data; - } -diff -Naur gnumach-20040229.orig/i386/i386/fpe_linkage.c gnumach-20040229/i386/i386/fpe_linkage.c ---- gnumach-20040229.orig/i386/i386/fpe_linkage.c 2004-09-15 16:10:15.000000000 +0200 -+++ gnumach-20040229/i386/i386/fpe_linkage.c 2004-09-15 16:09:23.000000000 +0200 -@@ -84,6 +84,7 @@ - ((struct real_gate *)&curr_idt(mycpu)[idx]) - - void set_user_access(); /* forward */ -+void enable_fpe(register struct i386_fpsave_state *ifps); - - /* - * long pointer for calling FPE register recovery routine. diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch new file mode 100644 index 0000000..7cfebf8 --- /dev/null +++ b/debian/patches/12_sis900.patch @@ -0,0 +1,2168 @@ +diff -ruN gnumach.orig/doc/mach.texi gnumach.sis900/doc/mach.texi +--- gnumach.orig/doc/mach.texi 2002-03-29 22:01:19.000000000 +0100 ++++ gnumach.sis900/doc/mach.texi 2005-03-26 21:08:35.000000000 +0100 +@@ -854,6 +854,9 @@ + + @item --enable-viarhine + Enables the VIA Rhine netword card devices eth%d. ++ ++@item --enable-sis900 ++Enables the SiS900 PCI netword card devices eth%d. + @end table + + +diff -ruN gnumach.orig/i386/README-Drivers gnumach.sis900/i386/README-Drivers +--- gnumach.orig/i386/README-Drivers 2001-05-27 14:44:22.000000000 +0200 ++++ gnumach.sis900/i386/README-Drivers 2005-03-26 21:08:35.000000000 +0100 +@@ -371,3 +371,7 @@ + + VIA Rhine + --enable-viarhine net/via_rhine.c ++ ++SiS 900 ++ --enable-sis900 net/sis900.c ++ +diff -ruN gnumach.orig/i386/linux/Makefile.in gnumach.sis900/i386/linux/Makefile.in +--- gnumach.orig/i386/linux/Makefile.in 2005-03-26 20:38:18.000000000 +0100 ++++ gnumach.sis900/i386/linux/Makefile.in 2005-03-26 21:08:35.000000000 +0100 +@@ -67,7 +67,7 @@ + atp.c de4x5.c de600.c de620.c depca.c dev.c e2100.c eepro.c \ + eepro100.c eexpress.c epic100.c eth16i.c ewrk3.c fmv18x.c \ + hp-plus.c hp.c hp100.c lance.c ne.c ne2k-pci.c net_init.c \ +- ni52.c ni65.c pcnet32.c rtl8139.c seeq8005.c sk_g16.c \ ++ ni52.c ni65.c pcnet32.c rtl8139.c seeq8005.c sis900.c sk_g16.c \ + smc-ultra.c smc-ultra32.c tlan.c tulip.c via-rhine.c wavelan.c \ + wd.c yellowfin.c znet.c net.c net.c cb_shim.c hamachi.c \ + intel-gige.c myson803.c natsemi.c ns820.c pci-scan.c \ +diff -ruN gnumach.orig/i386/linux/configure.ac gnumach.sis900/i386/linux/configure.ac +--- gnumach.orig/i386/linux/configure.ac 2005-03-26 20:38:18.000000000 +0100 ++++ gnumach.sis900/i386/linux/configure.ac 2005-03-26 21:08:35.000000000 +0100 +@@ -213,6 +213,7 @@ + linux_DRIVER([elplus], [ELPLUS], [3c505], [net]) + linux_DRIVER([de600], [DE600], [de600], [net]) + linux_DRIVER([de620], [DE620], [de620], [net]) ++linux_DRIVER([sis900], [SIS900], [sis900], [net]) + linux_DRIVER([skg16], [SK_G16], [sk_g16], [net]) + linux_DRIVER([ni52], [NI52], [ni52], [net]) + linux_DRIVER([ni65], [NI65], [ni65], [net]) +diff -ruN gnumach.orig/linux/dev/drivers/net/Space.c gnumach.sis900/linux/dev/drivers/net/Space.c +--- gnumach.orig/linux/dev/drivers/net/Space.c 2005-03-26 20:38:18.000000000 +0100 ++++ gnumach.sis900/linux/dev/drivers/net/Space.c 2005-03-26 21:08:35.000000000 +0100 +@@ -93,6 +93,7 @@ + extern int eepro100_probe(struct device *); + extern int epic100_probe(struct device *); + extern int rtl8139_probe(struct device *); ++extern int sis900_probe(struct device *); + extern int tlan_probe(struct device *); + extern int isa515_probe(struct device *); + extern int pcnet32_probe(struct device *); +@@ -137,6 +138,9 @@ + #ifdef CONFIG_RTL8139 + && rtl8139_probe(dev) + #endif ++#ifdef CONFIG_SIS900 ++ && sis900_probe(dev) ++#endif + #ifdef CONFIG_VIA_RHINE + && via_rhine_probe(dev) + #endif +diff -ruN gnumach.orig/linux/src/drivers/net/sis900.c gnumach.sis900/linux/src/drivers/net/sis900.c +--- gnumach.orig/linux/src/drivers/net/sis900.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnumach.sis900/linux/src/drivers/net/sis900.c 2005-03-27 20:52:47.000000000 +0200 +@@ -0,0 +1,1803 @@ ++/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux. ++ Copyright 1999 Silicon Integrated System Corporation ++ Revision: 1.06.11 Apr. 30 2002 ++ ++ Modified from the driver which is originally written by Donald Becker. ++ ++ This software may be used and distributed according to the terms ++ of the GNU Public License (GPL), incorporated herein by reference. ++ Drivers based on this skeleton fall under the GPL and must retain ++ the authorship (implicit copyright) notice. ++ ++ References: ++ SiS 7016 Fast Ethernet PCI Bus 10/100 Mbps LAN Controller with OnNow Support, ++ preliminary Rev. 1.0 Jan. 14, 1998 ++ SiS 900 Fast Ethernet PCI Bus 10/100 Mbps LAN Single Chip with OnNow Support, ++ preliminary Rev. 1.0 Nov. 10, 1998 ++ SiS 7014 Single Chip 100BASE-TX/10BASE-T Physical Layer Solution, ++ preliminary Rev. 1.0 Jan. 18, 1998 ++ http://www.sis.com.tw/support/databook.htm ++ ++ Rev 1.06.11 Apr. 25 2002 Mufasa Yang (mufasa@sis.com.tw) added SiS962 support ++ Rev 1.06.10 Dec. 18 2001 Hui-Fen Hsu workaround for EDB & RTL8201 PHY ++ Rev 1.06.09 Sep. 28 2001 Hui-Fen Hsu update for 630ET & workaround for ICS1893 PHY ++ Rev 1.06.08 Mar. 2 2001 Hui-Fen Hsu (hfhsu@sis.com.tw) some bug fix & 635M/B support ++ Rev 1.06.07 Jan. 8 2001 Lei-Chun Chang added RTL8201 PHY support ++ Rev 1.06.06 Sep. 6 2000 Lei-Chun Chang added ICS1893 PHY support ++ Rev 1.06.05 Aug. 22 2000 Lei-Chun Chang (lcchang@sis.com.tw) modified 630E equalier workaroung rule ++ Rev 1.06.03 Dec. 23 1999 Ollie Lho Third release ++ Rev 1.06.02 Nov. 23 1999 Ollie Lho bug in mac probing fixed ++ Rev 1.06.01 Nov. 16 1999 Ollie Lho CRC calculation provide by Joseph Zbiciak (im14u2c@primenet.com) ++ Rev 1.06 Nov. 4 1999 Ollie Lho (ollie@sis.com.tw) Second release ++ Rev 1.05.05 Oct. 29 1999 Ollie Lho (ollie@sis.com.tw) Single buffer Tx/Rx ++ Chin-Shan Li (lcs@sis.com.tw) Added AMD Am79c901 HomePNA PHY support ++ Rev 1.05 Aug. 7 1999 Jim Huang (cmhuang@sis.com.tw) Initial release ++*/ ++ ++#include <linux/module.h> ++#include <linux/version.h> ++#include <linux/kernel.h> ++#include <linux/sched.h> ++#include <linux/string.h> ++#include <linux/timer.h> ++#include <linux/errno.h> ++#include <linux/ioport.h> ++#include <linux/malloc.h> ++#include <linux/interrupt.h> ++#include <linux/pci.h> ++#include <linux/netdevice.h> ++#include <linux/bios32.h> ++#include <linux/compatmac.h> ++ ++#include <linux/etherdevice.h> ++#include <linux/skbuff.h> ++#include <asm/processor.h> /* Processor type for cache alignment. */ ++#include <asm/bitops.h> ++#include <asm/io.h> ++#include <linux/delay.h> ++#include <asm/types.h> ++#include "sis900.h" ++ ++ ++#if LINUX_VERSION_CODE < 0x20159 ++#define dev_free_skb(skb) dev_kfree_skb (skb, FREE_WRITE); ++#else /* Grrr, incompatible changes should change the name. */ ++#define dev_free_skb(skb) dev_kfree_skb(skb); ++#endif ++ ++static const char *version = ++"sis900.c: modified v1.06.11 4/30/2002"; ++ ++static int max_interrupt_work = 20; ++static int multicast_filter_limit = 128; ++ ++#define sis900_debug debug ++static int sis900_debug = 0; ++ ++/* Time in jiffies before concluding the transmitter is hung. */ ++#define TX_TIMEOUT (4*HZ) ++ ++enum pci_flags_bit { ++ PCI_USES_IO=1, PCI_USES_MEM=2, PCI_USES_MASTER=4, ++ PCI_ADDR0=0x10<<0, PCI_ADDR1=0x10<<1, PCI_ADDR2=0x10<<2, PCI_ADDR3=0x10<<3, ++}; ++ ++struct mac_chip_info { ++ const char *name; ++ u16 vendor_id, device_id, flags; ++ int io_size; ++ struct device *(*probe) (struct mac_chip_info *mac, long ioaddr, int irq, ++ int pci_index, unsigned char pci_device_fn, unsigned char pci_bus, struct device * net_dev); ++}; ++static struct device * sis900_mac_probe (struct mac_chip_info * mac, long ioaddr, int irq, ++ int pci_index, unsigned char pci_device_fn, ++ unsigned char pci_bus, struct device * net_dev); ++static struct mac_chip_info mac_chip_table[] = { ++ { "SiS 900 PCI Fast Ethernet", PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_900, ++ PCI_COMMAND_IO|PCI_COMMAND_MASTER, SIS900_TOTAL_SIZE, sis900_mac_probe}, ++ { "SiS 7016 PCI Fast Ethernet",PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016, ++ PCI_COMMAND_IO|PCI_COMMAND_MASTER, SIS900_TOTAL_SIZE, sis900_mac_probe}, ++ {0,}, /* 0 terminatted list. */ ++}; ++ ++static void sis900_read_mode(struct device *net_dev, int *speed, int *duplex); ++ ++static struct mii_chip_info { ++ const char * name; ++ u16 phy_id0; ++ u16 phy_id1; ++ u8 phy_types; ++#define HOME 0x0001 ++#define LAN 0x0002 ++#define MIX 0x0003 ++} mii_chip_table[] = { ++ { "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN }, ++ { "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN }, ++ { "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN }, ++ { "AMD 79C901 HomePNA PHY", 0x0000, 0x6B90, HOME}, ++ { "ICS LAN PHY", 0x0015, 0xF440, LAN }, ++ { "NS 83851 PHY", 0x2000, 0x5C20, MIX }, ++ { "Realtek RTL8201 PHY", 0x0000, 0x8200, LAN }, ++ {0,}, ++}; ++ ++struct mii_phy { ++ struct mii_phy * next; ++ int phy_addr; ++ u16 phy_id0; ++ u16 phy_id1; ++ u16 status; ++ u8 phy_types; ++}; ++ ++typedef struct _BufferDesc { ++ u32 link; ++ u32 cmdsts; ++ u32 bufptr; ++} BufferDesc; ++ ++struct sis900_private { ++ struct device *next_module; ++ struct enet_statistics stats; ++ ++ /* struct pci_dev * pci_dev;*/ ++ unsigned char pci_bus; ++ unsigned char pci_device_fn; ++ int pci_index; ++ ++ struct mac_chip_info * mac; ++ struct mii_phy * mii; ++ struct mii_phy * first_mii; /* record the first mii structure */ ++ unsigned int cur_phy; ++ ++ struct timer_list timer; /* Link status detection timer. */ ++ u8 autong_complete; /* 1: auto-negotiate complete */ ++ ++ unsigned int cur_rx, dirty_rx; /* producer/comsumer pointers for Tx/Rx ring */ ++ unsigned int cur_tx, dirty_tx; ++ ++ /* The saved address of a sent/receive-in-place packet buffer */ ++ struct sk_buff *tx_skbuff[NUM_TX_DESC]; ++ struct sk_buff *rx_skbuff[NUM_RX_DESC]; ++ BufferDesc tx_ring[NUM_TX_DESC]; ++ BufferDesc rx_ring[NUM_RX_DESC]; ++ ++ unsigned int tx_full; /* The Tx queue is full. */ ++ int LinkOn; ++}; ++ ++#ifdef MODULE ++#if LINUX_VERSION_CODE > 0x20115 ++MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>, Ollie Lho <ollie@sis.com.tw>"); ++MODULE_DESCRIPTION("SiS 900 PCI Fast Ethernet driver"); ++MODULE_PARM(multicast_filter_limit, "i"); ++MODULE_PARM(max_interrupt_work, "i"); ++MODULE_PARM(debug, "i"); ++#endif ++#endif ++ ++static int sis900_open(struct device *net_dev); ++static int sis900_mii_probe (unsigned char pci_bus, unsigned char pci_device_fn, struct device * net_dev); ++static void sis900_init_rxfilter (struct device * net_dev); ++static u16 read_eeprom(long ioaddr, int location); ++static u16 mdio_read(struct device *net_dev, int phy_id, int location); ++static void mdio_write(struct device *net_dev, int phy_id, int location, int val); ++static void sis900_timer(unsigned long data); ++static void sis900_check_mode (struct device *net_dev, struct mii_phy *mii_phy); ++static void sis900_tx_timeout(struct device *net_dev); ++static void sis900_init_tx_ring(struct device *net_dev); ++static void sis900_init_rx_ring(struct device *net_dev); ++static int sis900_start_xmit(struct sk_buff *skb, struct device *net_dev); ++static int sis900_rx(struct device *net_dev); ++static void sis900_finish_xmit (struct device *net_dev); ++static void sis900_interrupt(int irq, void *dev_instance, struct pt_regs *regs); ++static int sis900_close(struct device *net_dev); ++static int mii_ioctl(struct device *net_dev, struct ifreq *rq, int cmd); ++static struct enet_statistics *sis900_get_stats(struct device *net_dev); ++static u16 sis900_compute_hashtable_index(u8 *addr, u8 revision); ++static void set_rx_mode(struct device *net_dev); ++static void sis900_reset(struct device *net_dev); ++static void sis630_set_eq(struct device *net_dev, u8 revision); ++static u16 sis900_default_phy(struct device * net_dev); ++static void sis900_set_capability( struct device *net_dev ,struct mii_phy *phy); ++static u16 sis900_reset_phy(struct device *net_dev, int phy_addr); ++static void sis900_auto_negotiate(struct device *net_dev, int phy_addr); ++static void sis900_set_mode (long ioaddr, int speed, int duplex); ++ ++/* A list of all installed SiS900 devices, for removing the driver module. */ ++static struct device *root_sis900_dev = NULL; ++ ++#ifdef HAVE_DEVLIST ++struct netdev_entry netcard_drv = ++ {"sis900", sis900_probe, SIS900_TOTAL_SIZE, NULL}; ++#endif ++ ++/* walk through every ethernet PCI devices to see if some of them are matched with our card list*/ ++int sis900_probe (struct device * net_dev) ++{ ++ int found = 0; ++ int pci_index = 0; ++ unsigned char pci_bus, pci_device_fn; ++ long ioaddr; ++ int irq; ++ ++ if (!pcibios_present()) ++ return -ENODEV; ++ ++ for (; pci_index < 0xff; pci_index++) ++ { ++ u16 vendor, device, pci_command; ++ struct mac_chip_info *mac; ++ ++ if (pcibios_find_class (PCI_CLASS_NETWORK_ETHERNET << 8, pci_index, ++ &pci_bus, &pci_device_fn) != PCIBIOS_SUCCESSFUL) ++ break; ++ ++ pcibios_read_config_word(pci_bus, pci_device_fn, PCI_VENDOR_ID, &vendor); ++ pcibios_read_config_word(pci_bus, pci_device_fn, PCI_DEVICE_ID, &device); ++ ++ for (mac = mac_chip_table; mac->vendor_id; mac++) ++ { ++ if (vendor == mac->vendor_id && device == mac->device_id) break; ++ } ++ ++ /* pci_dev does not match any of our cards */ ++ if (mac->vendor_id == 0) ++ continue; ++ ++ { ++ u32 pci_ioaddr; ++ u8 pci_irq_line; ++ ++ pcibios_read_config_byte(pci_bus, pci_device_fn, ++ PCI_INTERRUPT_LINE, &pci_irq_line); ++ pcibios_read_config_dword(pci_bus, pci_device_fn, ++ PCI_BASE_ADDRESS_0, &pci_ioaddr); ++ ioaddr = pci_ioaddr & ~3; ++ irq = pci_irq_line; ++ ++ if ((mac->flags & PCI_USES_IO) && ++ check_region (pci_ioaddr, mac->io_size)) ++ continue; ++ ++ pcibios_read_config_word(pci_bus, pci_device_fn, ++ PCI_COMMAND, &pci_command); ++ ++ { ++ u8 lat; ++ ++ pcibios_read_config_byte(pci_bus, pci_device_fn, PCI_LATENCY_TIMER, &lat); ++ if (lat < 16) { ++ printk("PCI: Increasing latency timer of device %02x:%02x to 64\n", ++ pci_bus, pci_device_fn); ++ pcibios_write_config_byte(pci_bus, pci_device_fn, PCI_LATENCY_TIMER, 64); ++ } ++ } ++ net_dev = mac->probe (mac, ioaddr, irq, pci_index, pci_device_fn, pci_bus, net_dev); ++ if (net_dev != NULL) ++ { ++ found++; ++ } ++ net_dev = NULL; ++ } ++ } ++ return found ? 0 : -ENODEV; ++ ++} ++ ++/* older SiS900 and friends, use EEPROM to store MAC address */ ++static int ++sis900_get_mac_addr(long ioaddr, struct device *net_dev) ++{ ++ u16 signature; ++ int i; ++ ++ /* check to see if we have sane EEPROM */ ++ signature = (u16) read_eeprom(ioaddr, EEPROMSignature); ++ if (signature == 0xffff || signature == 0x0000) { ++ printk (KERN_INFO "%s: Error EERPOM read %x\n", ++ net_dev->name, signature); ++ return 0; ++ } ++ ++ /* get MAC address from EEPROM */ ++ for (i = 0; i < 3; i++) ++ ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr); ++ return 1; ++} ++ ++/* SiS630E model, use APC CMOS RAM to store MAC address */ ++static int sis630e_get_mac_addr(long ioaddr, int pci_index, struct device *net_dev) ++{ ++ u8 reg; ++ int i; ++ u8 pci_bus, pci_dfn; ++ int not_found; ++ ++ not_found = pcibios_find_device(0x1039, 0x0008, ++ pci_index, ++ &pci_bus, ++ &pci_dfn); ++ if (not_found) { ++ printk("%s: Can not find ISA bridge\n", net_dev->name); ++ return 0; ++ } ++ pcibios_read_config_byte(pci_bus, pci_dfn, 0x48, ®); ++ pcibios_write_config_byte(pci_bus, pci_dfn, 0x48, reg | 0x40); ++ ++ for (i = 0; i < 6; i++) { ++ outb(0x09 + i, 0x70); ++ ((u8 *)(net_dev->dev_addr))[i] = inb(0x71); ++ } ++ pcibios_write_config_byte(pci_bus, pci_dfn, 0x48, reg & ~0x40); ++ ++ return 1; ++} ++ ++/* 635 model : set Mac reload bit and get mac address from rfdr */ ++static int sis635_get_mac_addr(struct device *net_dev) ++{ ++ long ioaddr = net_dev->base_addr; ++ u32 rfcrSave; ++ u32 i; ++ ++ rfcrSave = inl(rfcr + ioaddr); ++ ++ outl(rfcrSave | RELOAD, ioaddr + cr); ++ outl(0, ioaddr + cr); ++ ++ /* disable packet filtering before setting filter */ ++ outl(rfcrSave & ~RFEN, rfcr + ioaddr); ++ ++ /* load MAC addr to filter data register */ ++ for (i = 0 ; i < 3 ; i++) { ++ outl((i << RFADDR_shift), ioaddr + rfcr); ++ *( ((u16 *)net_dev->dev_addr) + i) = inw(ioaddr + rfdr); ++ } ++ ++ /* enable packet filitering */ ++ outl(rfcrSave | RFEN, rfcr + ioaddr); ++ ++ return 1; ++} ++ ++ ++/** ++ * sis962_get_mac_addr: - Get MAC address for SiS962 model ++ * @pci_dev: the sis900 pci device ++ * @net_dev: the net device to get address for ++ * ++ * SiS962 model, use EEPROM to store MAC address. And EEPROM is shared by ++ * LAN and 1394. When access EEPROM, send EEREQ signal to hardware first ++ * and wait for EEGNT. If EEGNT is ON, EEPROM is permitted to be access ++ * by LAN, otherwise is not. After MAC address is read from EEPROM, send ++ * EEDONE signal to refuse EEPROM access by LAN. ++ * MAC address is read into @net_dev->dev_addr. ++ */ ++ ++static int sis962_get_mac_addr(struct device *net_dev) ++{ ++ long ioaddr = net_dev->base_addr; ++ long ee_addr = ioaddr + mear; ++ u32 waittime = 0; ++ int i; ++ ++ outl(EEREQ, ee_addr); ++ while(waittime < 2000) { ++ if(inl(ee_addr) & EEGNT) { ++ /* get MAC address from EEPROM */ ++ for (i = 0; i < 3; i++) ++ ((u16 *)(net_dev->dev_addr))[i] = read_eeprom(ioaddr, i+EEPROMMACAddr); ++ outl(EEDONE, ee_addr); ++ return 1; ++ } else { ++ udelay(1); ++ waittime ++; ++ } ++ } ++ outl(EEDONE, ee_addr); ++ return 0; ++} ++ ++struct device * ++sis900_mac_probe (struct mac_chip_info *mac, long ioaddr, int irq, int pci_index, ++ unsigned char pci_device_fn, unsigned char pci_bus, struct device * net_dev) ++{ ++ struct sis900_private *sis_priv; ++ static int did_version = 0; ++ ++ u8 revision; ++ int i, ret = 0; ++ ++ if (did_version++ == 0) ++ printk(KERN_INFO "%s\n", version); ++ ++ if ((net_dev = init_etherdev(net_dev, 0)) == NULL) ++ return NULL; ++ ++ if ((net_dev->priv = kmalloc(sizeof(struct sis900_private), GFP_KERNEL)) == NULL) { ++ unregister_netdev(net_dev); ++ return NULL; ++ } ++ ++ sis_priv = net_dev->priv; ++ memset(sis_priv, 0, sizeof(struct sis900_private)); ++ ++ /* We do a request_region() to register /proc/ioports info. */ ++ request_region(ioaddr, mac->io_size, net_dev->name); ++ net_dev->base_addr = ioaddr; ++ net_dev->irq = irq; ++ ++ sis_priv->mac = mac; ++ sis_priv->pci_bus = pci_bus; ++ sis_priv->pci_device_fn = pci_device_fn; ++ sis_priv->pci_index = pci_index; ++ ++ pcibios_read_config_byte(pci_bus, pci_device_fn, PCI_CLASS_REVISION, &revision); ++ ++ if ( revision == SIS630E_900_REV ) ++ ret = sis630e_get_mac_addr(ioaddr, pci_index, net_dev); ++ else if ((revision > 0x81) && (revision <= 0x90)) ++ ret = sis635_get_mac_addr(net_dev); ++ else if (revision == SIS962_900_REV) ++ ret = sis962_get_mac_addr(net_dev); ++ else ++ ret = sis900_get_mac_addr(ioaddr, net_dev); ++ ++ if (ret == 0) { ++ unregister_netdev(net_dev); ++ return NULL; ++ } ++ ++ /* print some information about our NIC */ ++ printk(KERN_INFO "%s: %s at %#lx, IRQ %d, ", net_dev->name, mac->name, ++ ioaddr, irq); ++ for (i = 0; i < 5; i++) ++ printk("%2.2x:", (u8)net_dev->dev_addr[i]); ++ printk("%2.2x.\n", net_dev->dev_addr[i]); ++ ++ /* 630ET : set the mii access mode as software-mode */ ++ if (revision == SIS630ET_900_REV) ++ outl(ACCESSMODE | inl(ioaddr + cr), ioaddr + cr); ++ ++ /* probe for mii transceiver */ ++ if (sis900_mii_probe(pci_bus, pci_device_fn, net_dev) == 0) { ++ unregister_netdev(net_dev); ++ kfree(sis_priv); ++ release_region(ioaddr, mac->io_size); ++ return NULL; ++ } ++ ++ sis_priv->next_module = root_sis900_dev; ++ root_sis900_dev = net_dev; ++ ++ /* The SiS900-specific entries in the device structure. */ ++ net_dev->open = &sis900_open; ++ net_dev->hard_start_xmit = &sis900_start_xmit; ++ net_dev->stop = &sis900_close; ++ net_dev->get_stats = &sis900_get_stats; ++ net_dev->set_multicast_list = &set_rx_mode; ++ net_dev->do_ioctl = &mii_ioctl; ++ ++ return net_dev; ++} ++ ++/* sis900_mii_probe: - Probe MII PHY for sis900 */ ++static int sis900_mii_probe (unsigned char pci_bus, unsigned char pci_device_fn, struct device * net_dev) ++{ ++ struct sis900_private * sis_priv = (struct sis900_private *)net_dev->priv; ++ u16 poll_bit = MII_STAT_LINK, status = 0; ++ unsigned int timeout = jiffies + 5 * HZ; ++ int phy_addr; ++ u8 revision; ++ ++ sis_priv->mii = NULL; ++ ++ /* search for total of 32 possible mii phy addresses */ ++ for (phy_addr = 0; phy_addr < 32; phy_addr++) { ++ struct mii_phy * mii_phy = NULL; ++ u16 mii_status; ++ int i; ++ ++ for(i=0; i<2; i++) ++ mii_status = mdio_read(net_dev, phy_addr, MII_STATUS); ++ ++ if (mii_status == 0xffff || mii_status == 0x0000) ++ /* the mii is not accessable, try next one */ ++ continue; ++ ++ if ((mii_phy = kmalloc(sizeof(struct mii_phy), GFP_KERNEL)) == NULL) { ++ printk(KERN_INFO "Cannot allocate mem for struct mii_phy\n"); ++ return 0; ++ } ++ ++ mii_phy->phy_id0 = mdio_read(net_dev, phy_addr, MII_PHY_ID0); ++ mii_phy->phy_id1 = mdio_read(net_dev, phy_addr, MII_PHY_ID1); ++ mii_phy->phy_addr = phy_addr; ++ mii_phy->status = mii_status; ++ mii_phy->next = sis_priv->mii; ++ sis_priv->mii = mii_phy; ++ sis_priv->first_mii = mii_phy; ++ ++ for (i=0; mii_chip_table[i].phy_id1; i++) ++ if ( ( mii_phy->phy_id0 == mii_chip_table[i].phy_id0 ) && ++ ( (mii_phy->phy_id1 & 0xFFF0) == mii_chip_table[i].phy_id1 )){ ++ ++ mii_phy->phy_types = mii_chip_table[i].phy_types; ++ if(mii_chip_table[i].phy_types == MIX) ++ mii_phy->phy_types = ++ (mii_status & (MII_STAT_CAN_TX_FDX | MII_STAT_CAN_TX))?LAN:HOME; ++ printk(KERN_INFO "%s: %s transceiver found at address %d.\n", ++ net_dev->name, mii_chip_table[i].name, phy_addr); ++ break; ++ } ++ ++ if( !mii_chip_table[i].phy_id1 ) ++ printk(KERN_INFO "%s: Unknown PHY transceiver found at address %d.\n", ++ net_dev->name, phy_addr); ++ } ++ ++ if (sis_priv->mii == NULL) { ++ printk(KERN_INFO "%s: No MII transceivers found!\n", ++ net_dev->name); ++ return 0; ++ } ++ ++ /* Slect Default PHY to put in sis_priv->mii & sis_priv->cur_phy */ ++ sis_priv->mii = NULL; ++ sis900_default_phy( net_dev ); ++ ++ /* Reset PHY if default PHY is internal sis900 */ ++ if( (sis_priv->mii->phy_id0 == 0x001D) && ++ ( (sis_priv->mii->phy_id1&0xFFF0) == 0x8000) ) ++ status = sis900_reset_phy( net_dev, sis_priv->cur_phy ); ++ ++ /* workaround for ICS1893 PHY */ ++ if ((sis_priv->mii->phy_id0 == 0x0015) && ++ ((sis_priv->mii->phy_id1&0xFFF0) == 0xF440)) ++ mdio_write(net_dev, sis_priv->cur_phy, 0x0018, 0xD200); ++ ++ if( status & MII_STAT_LINK ){ ++ while (poll_bit) ++ { ++ poll_bit ^= (mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS) & poll_bit); ++ if (jiffies >= timeout) ++ { ++ printk(KERN_WARNING "%s: reset phy and link down now\n", net_dev->name); ++ return -ETIME; ++ } ++ } ++ } ++ ++ pcibios_read_config_byte(pci_bus, pci_device_fn, PCI_CLASS_REVISION, &revision); ++ if (revision == SIS630E_900_REV) { ++ /* SiS 630E has some bugs on default value of PHY registers */ ++ mdio_write(net_dev, sis_priv->cur_phy, MII_ANADV, 0x05e1); ++ mdio_write(net_dev, sis_priv->cur_phy, MII_CONFIG1, 0x22); ++ mdio_write(net_dev, sis_priv->cur_phy, MII_CONFIG2, 0xff00); ++ mdio_write(net_dev, sis_priv->cur_phy, MII_MASK, 0xffc0); ++ //mdio_write(net_dev, sis_priv->cur_phy, MII_CONTROL, 0x1000); ++ } ++ ++ if (sis_priv->mii->status & MII_STAT_LINK) ++ sis_priv->LinkOn = TRUE; ++ else ++ sis_priv->LinkOn = FALSE; ++ ++ return 1; ++} ++ ++ ++/* sis900_default_phy : Select one default PHY for sis900 mac */ ++static u16 sis900_default_phy(struct device * net_dev) ++{ ++ struct sis900_private * sis_priv = (struct sis900_private *)net_dev->priv; ++ struct mii_phy *phy = NULL, *phy_home = NULL, *default_phy = NULL; ++ u16 status; ++ ++ for( phy=sis_priv->first_mii; phy; phy=phy->next ){ ++ status = mdio_read(net_dev, phy->phy_addr, MII_STATUS); ++ status = mdio_read(net_dev, phy->phy_addr, MII_STATUS); ++ ++ /* Link ON & Not select deafalut PHY */ ++ if ( (status & MII_STAT_LINK) && !(default_phy) ) ++ default_phy = phy; ++ else{ ++ status = mdio_read(net_dev, phy->phy_addr, MII_CONTROL); ++ mdio_write(net_dev, phy->phy_addr, MII_CONTROL, ++ status | MII_CNTL_AUTO | MII_CNTL_ISOLATE); ++ if( phy->phy_types == HOME ) ++ phy_home = phy; ++ } ++ } ++ ++ if( (!default_phy) && phy_home ) ++ default_phy = phy_home; ++ else if(!default_phy) ++ default_phy = sis_priv->first_mii; ++ ++ if( sis_priv->mii != default_phy ){ ++ sis_priv->mii = default_phy; ++ sis_priv->cur_phy = default_phy->phy_addr; ++ printk(KERN_INFO "%s: Using transceiver found at address %d as default\n", net_dev->name,sis_priv->cur_phy); ++ } ++ ++ status = mdio_read(net_dev, sis_priv->cur_phy, MII_CONTROL); ++ status &= (~MII_CNTL_ISOLATE); ++ ++ mdio_write(net_dev, sis_priv->cur_phy, MII_CONTROL, status); ++ status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS); ++ status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS); ++ ++ return status; ++} ++ ++ ++/* sis900_set_capability : set the media capability of network adapter */ ++static void sis900_set_capability( struct device *net_dev , struct mii_phy *phy ) ++{ ++ u16 cap; ++ u16 status; ++ ++ status = mdio_read(net_dev, phy->phy_addr, MII_STATUS); ++ status = mdio_read(net_dev, phy->phy_addr, MII_STATUS); ++ ++ cap = MII_NWAY_CSMA_CD | ++ ((phy->status & MII_STAT_CAN_TX_FDX)? MII_NWAY_TX_FDX:0) | ++ ((phy->status & MII_STAT_CAN_TX) ? MII_NWAY_TX:0) | ++ ((phy->status & MII_STAT_CAN_T_FDX) ? MII_NWAY_T_FDX:0)| ++ ((phy->status & MII_STAT_CAN_T) ? MII_NWAY_T:0); ++ ++ mdio_write( net_dev, phy->phy_addr, MII_ANADV, cap ); ++} ++ ++ ++/* Delay between EEPROM clock transitions. */ ++#define eeprom_delay() inl(ee_addr) ++ ++/* Read Serial EEPROM through EEPROM Access Register, Note that location is ++ in word (16 bits) unit */ ++static u16 read_eeprom(long ioaddr, int location) ++{ ++ int i; ++ u16 retval = 0; ++ long ee_addr = ioaddr + mear; ++ u32 read_cmd = location | EEread; ++ ++ outl(0, ee_addr); ++ eeprom_delay(); ++ outl(EECS, ee_addr); ++ eeprom_delay(); ++ ++ /* Shift the read command (9) bits out. */ ++ for (i = 8; i >= 0; i--) { ++ u32 dataval = (read_cmd & (1 << i)) ? EEDI | EECS : EECS; ++ outl(dataval, ee_addr); ++ eeprom_delay(); ++ outl(dataval | EECLK, ee_addr); ++ eeprom_delay(); ++ } ++ outb(EECS, ee_addr); ++ eeprom_delay(); ++ ++ /* read the 16-bits data in */ ++ for (i = 16; i > 0; i--) { ++ outl(EECS, ee_addr); ++ eeprom_delay(); ++ outl(EECS | EECLK, ee_addr); ++ eeprom_delay(); ++ retval = (retval << 1) | ((inl(ee_addr) & EEDO) ? 1 : 0); ++ eeprom_delay(); ++ } ++ ++ /* Terminate the EEPROM access. */ ++ outl(0, ee_addr); ++ eeprom_delay(); ++// outl(EECLK, ee_addr); ++ ++ return (retval); ++} ++ ++/* Read and write the MII management registers using software-generated ++ serial MDIO protocol. Note that the command bits and data bits are ++ send out seperately */ ++#define mdio_delay() inl(mdio_addr) ++ ++static void mdio_idle(long mdio_addr) ++{ ++ outl(MDIO | MDDIR, mdio_addr); ++ mdio_delay(); ++ outl(MDIO | MDDIR | MDC, mdio_addr); ++} ++ ++/* Syncronize the MII management interface by shifting 32 one bits out. */ ++static void mdio_reset(long mdio_addr) ++{ ++ int i; ++ ++ for (i = 31; i >= 0; i--) { ++ outl(MDDIR | MDIO, mdio_addr); ++ mdio_delay(); ++ outl(MDDIR | MDIO | MDC, mdio_addr); ++ mdio_delay(); ++ } ++ return; ++} ++ ++static u16 mdio_read(struct device *net_dev, int phy_id, int location) ++{ ++ long mdio_addr = net_dev->base_addr + mear; ++ int mii_cmd = MIIread|(phy_id<<MIIpmdShift)|(location<<MIIregShift); ++ u16 retval = 0; ++ int i; ++ ++ mdio_reset(mdio_addr); ++ mdio_idle(mdio_addr); ++ ++ for (i = 15; i >= 0; i--) { ++ int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR; ++ outl(dataval, mdio_addr); ++ mdio_delay(); ++ outl(dataval | MDC, mdio_addr); ++ mdio_delay(); ++ } ++ ++ /* Read the 16 data bits. */ ++ for (i = 16; i > 0; i--) { ++ outl(0, mdio_addr); ++ mdio_delay(); ++ retval = (retval << 1) | ((inl(mdio_addr) & MDIO) ? 1 : 0); ++ outl(MDC, mdio_addr); ++ mdio_delay(); ++ } ++ outl(0x00, mdio_addr); ++ ++ return retval; ++} ++ ++static void mdio_write(struct device *net_dev, int phy_id, int location, int value) ++{ ++ long mdio_addr = net_dev->base_addr + mear; ++ int mii_cmd = MIIwrite|(phy_id<<MIIpmdShift)|(location<<MIIregShift); ++ int i; ++ ++ mdio_reset(mdio_addr); ++ mdio_idle(mdio_addr); ++ ++ /* Shift the command bits out. */ ++ for (i = 15; i >= 0; i--) { ++ int dataval = (mii_cmd & (1 << i)) ? MDDIR | MDIO : MDDIR; ++ outb(dataval, mdio_addr); ++ mdio_delay(); ++ outb(dataval | MDC, mdio_addr); ++ mdio_delay(); ++ } ++ mdio_delay(); ++ ++ /* Shift the value bits out. */ ++ for (i = 15; i >= 0; i--) { ++ int dataval = (value & (1 << i)) ? MDDIR | MDIO : MDDIR; ++ outl(dataval, mdio_addr); ++ mdio_delay(); ++ outl(dataval | MDC, mdio_addr); ++ mdio_delay(); ++ } ++ mdio_delay(); ++ ++ /* Clear out extra bits. */ ++ for (i = 2; i > 0; i--) { ++ outb(0, mdio_addr); ++ mdio_delay(); ++ outb(MDC, mdio_addr); ++ mdio_delay(); ++ } ++ outl(0x00, mdio_addr); ++ ++ return; ++} ++ ++static u16 sis900_reset_phy(struct device *net_dev, int phy_addr) ++{ ++ int i = 0; ++ u16 status; ++ ++ while (i++ < 2) ++ status = mdio_read(net_dev, phy_addr, MII_STATUS); ++ ++ mdio_write( net_dev, phy_addr, MII_CONTROL, MII_CNTL_RESET ); ++ ++ return status; ++} ++ ++static int ++sis900_open(struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ u8 revision; ++ ++ /* Soft reset the chip. */ ++ sis900_reset(net_dev); ++ ++ /* Equalizer workaroung Rule */ ++ pcibios_read_config_byte(sis_priv->pci_bus, sis_priv->pci_device_fn, PCI_CLASS_REVISION, &revision); ++ sis630_set_eq(net_dev, revision); ++ ++ if (request_irq(net_dev->irq, &sis900_interrupt, SA_SHIRQ, net_dev->name, net_dev)) { ++ return -EAGAIN; ++ } ++ ++ MOD_INC_USE_COUNT; ++ ++ sis900_init_rxfilter(net_dev); ++ ++ sis900_init_tx_ring(net_dev); ++ sis900_init_rx_ring(net_dev); ++ ++ set_rx_mode(net_dev); ++ ++ net_dev->tbusy = 0; ++ net_dev->interrupt = 0; ++ net_dev->start = 1; ++ ++ /* Workaround for EDB */ ++ sis900_set_mode(ioaddr, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED); ++ ++ /* Enable all known interrupts by setting the interrupt mask. */ ++ outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); ++ outl(RxENA | inl(ioaddr + cr), ioaddr + cr); ++ outl(IE, ioaddr + ier); ++ ++ sis900_check_mode(net_dev, sis_priv->mii); ++ ++ /* Set the timer to switch to check for link beat and perhaps switch ++ to an alternate media type. */ ++ init_timer(&sis_priv->timer); ++ sis_priv->timer.expires = jiffies + HZ; ++ sis_priv->timer.data = (unsigned long)net_dev; ++ sis_priv->timer.function = &sis900_timer; ++ add_timer(&sis_priv->timer); ++ ++ return 0; ++} ++ ++/* set receive filter address to our MAC address */ ++static void ++sis900_init_rxfilter (struct device * net_dev) ++{ ++ long ioaddr = net_dev->base_addr; ++ u32 rfcrSave; ++ u32 i; ++ ++ rfcrSave = inl(rfcr + ioaddr); ++ ++ /* disable packet filtering before setting filter */ ++ outl(rfcrSave & ~RFEN, rfcr + ioaddr); ++ ++ /* load MAC addr to filter data register */ ++ for (i = 0 ; i < 3 ; i++) { ++ u32 w; ++ ++ w = (u32) *((u16 *)(net_dev->dev_addr)+i); ++ outl((i << RFADDR_shift), ioaddr + rfcr); ++ outl(w, ioaddr + rfdr); ++ ++ if (sis900_debug > 2) { ++ printk(KERN_INFO "%s: Receive Filter Addrss[%d]=%x\n", ++ net_dev->name, i, inl(ioaddr + rfdr)); ++ } ++ } ++ ++ /* enable packet filitering */ ++ outl(rfcrSave | RFEN, rfcr + ioaddr); ++} ++ ++/* Initialize the Tx ring. */ ++static void ++sis900_init_tx_ring(struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ int i; ++ ++ sis_priv->tx_full = 0; ++ sis_priv->dirty_tx = sis_priv->cur_tx = 0; ++ ++ for (i = 0; i < NUM_TX_DESC; i++) { ++ sis_priv->tx_skbuff[i] = NULL; ++ ++ sis_priv->tx_ring[i].link = (u32) virt_to_bus(&sis_priv->tx_ring[i+1]); ++ sis_priv->tx_ring[i].cmdsts = 0; ++ sis_priv->tx_ring[i].bufptr = 0; ++ } ++ sis_priv->tx_ring[i-1].link = (u32) virt_to_bus(&sis_priv->tx_ring[0]); ++ ++ /* load Transmit Descriptor Register */ ++ outl(virt_to_bus(&sis_priv->tx_ring[0]), ioaddr + txdp); ++ if (sis900_debug > 2) ++ printk(KERN_INFO "%s: TX descriptor register loaded with: %8.8x\n", ++ net_dev->name, inl(ioaddr + txdp)); ++} ++ ++/* Initialize the Rx descriptor ring, pre-allocate recevie buffers */ ++static void ++sis900_init_rx_ring(struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ int i; ++ ++ sis_priv->cur_rx = 0; ++ sis_priv->dirty_rx = 0; ++ ++ /* init RX descriptor */ ++ for (i = 0; i < NUM_RX_DESC; i++) { ++ sis_priv->rx_skbuff[i] = NULL; ++ ++ sis_priv->rx_ring[i].link = (u32) virt_to_bus(&sis_priv->rx_ring[i+1]); ++ sis_priv->rx_ring[i].cmdsts = 0; ++ sis_priv->rx_ring[i].bufptr = 0; ++ } ++ sis_priv->rx_ring[i-1].link = (u32) virt_to_bus(&sis_priv->rx_ring[0]); ++ ++ /* allocate sock buffers */ ++ for (i = 0; i < NUM_RX_DESC; i++) { ++ struct sk_buff *skb; ++ ++ if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { ++ /* not enough memory for skbuff, this makes a "hole" ++ on the buffer ring, it is not clear how the ++ hardware will react to this kind of degenerated ++ buffer */ ++ break; ++ } ++ skb->dev = net_dev; ++ sis_priv->rx_skbuff[i] = skb; ++ sis_priv->rx_ring[i].cmdsts = RX_BUF_SIZE; ++ sis_priv->rx_ring[i].bufptr = virt_to_bus(skb->tail); ++ } ++ sis_priv->dirty_rx = (unsigned int) (i - NUM_RX_DESC); ++ ++ /* load Receive Descriptor Register */ ++ outl(virt_to_bus(&sis_priv->rx_ring[0]), ioaddr + rxdp); ++ if (sis900_debug > 2) ++ printk(KERN_INFO "%s: RX descriptor register loaded with: %8.8x\n", ++ net_dev->name, inl(ioaddr + rxdp)); ++} ++ ++/** ++ * sis630_set_eq: - set phy equalizer value for 630 LAN ++ * @net_dev: the net device to set equalizer value ++ * @revision: 630 LAN revision number ++ * ++ * 630E equalizer workaround rule(Cyrus Huang 08/15) ++ * PHY register 14h(Test) ++ * Bit 14: 0 -- Automatically dectect (default) ++ * 1 -- Manually set Equalizer filter ++ * Bit 13: 0 -- (Default) ++ * 1 -- Speed up convergence of equalizer setting ++ * Bit 9 : 0 -- (Default) ++ * 1 -- Disable Baseline Wander ++ * Bit 3~7 -- Equalizer filter setting ++ * Link ON: Set Bit 9, 13 to 1, Bit 14 to 0 ++ * Then calculate equalizer value ++ * Then set equalizer value, and set Bit 14 to 1, Bit 9 to 0 ++ * Link Off:Set Bit 13 to 1, Bit 14 to 0 ++ * Calculate Equalizer value: ++ * When Link is ON and Bit 14 is 0, SIS900PHY will auto-dectect proper equalizer value. ++ * When the equalizer is stable, this value is not a fixed value. It will be within ++ * a small range(eg. 7~9). Then we get a minimum and a maximum value(eg. min=7, max=9) ++ * 0 <= max <= 4 --> set equalizer to max ++ * 5 <= max <= 14 --> set equalizer to max+1 or set equalizer to max+2 if max == min ++ * max >= 15 --> set equalizer to max+5 or set equalizer to max+6 if max == min ++ */ ++ ++static void sis630_set_eq(struct device *net_dev, u8 revision) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ u16 reg14h, eq_value, max_value=0, min_value=0; ++ u8 host_bridge_rev; ++ int i, maxcount=10; ++ int not_found; ++ u8 pci_bus, pci_device_fn; ++ ++ if ( !(revision == SIS630E_900_REV || revision == SIS630EA1_900_REV || ++ revision == SIS630A_900_REV || revision == SIS630ET_900_REV) ) ++ return; ++ not_found = pcibios_find_device(SIS630_VENDOR_ID, SIS630_DEVICE_ID, ++ sis_priv->pci_index, ++ &pci_bus, ++ &pci_device_fn); ++ if (not_found) ++ pcibios_read_config_byte(pci_bus, pci_device_fn, PCI_CLASS_REVISION, &host_bridge_rev); ++ ++ if (sis_priv->LinkOn) { ++ reg14h=mdio_read(net_dev, sis_priv->cur_phy, MII_RESV); ++ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, (0x2200 | reg14h) & 0xBFFF); ++ for (i=0; i < maxcount; i++) { ++ eq_value=(0x00F8 & mdio_read(net_dev, sis_priv->cur_phy, MII_RESV)) >> 3; ++ if (i == 0) ++ max_value=min_value=eq_value; ++ max_value=(eq_value > max_value) ? eq_value : max_value; ++ min_value=(eq_value < min_value) ? eq_value : min_value; ++ } ++ /* 630E rule to determine the equalizer value */ ++ if (revision == SIS630E_900_REV || revision == SIS630EA1_900_REV || ++ revision == SIS630ET_900_REV) { ++ if (max_value < 5) ++ eq_value=max_value; ++ else if (max_value >= 5 && max_value < 15) ++ eq_value=(max_value == min_value) ? max_value+2 : max_value+1; ++ else if (max_value >= 15) ++ eq_value=(max_value == min_value) ? max_value+6 : max_value+5; ++ } ++ /* 630B0&B1 rule to determine the equalizer value */ ++ if (revision == SIS630A_900_REV && ++ (host_bridge_rev == SIS630B0 || host_bridge_rev == SIS630B1)) { ++ if (max_value == 0) ++ eq_value=3; ++ else ++ eq_value=(max_value+min_value+1)/2; ++ } ++ /* write equalizer value and setting */ ++ reg14h=mdio_read(net_dev, sis_priv->cur_phy, MII_RESV); ++ reg14h=(reg14h & 0xFF07) | ((eq_value << 3) & 0x00F8); ++ reg14h=(reg14h | 0x6000) & 0xFDFF; ++ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, reg14h); ++ } ++ else { ++ reg14h=mdio_read(net_dev, sis_priv->cur_phy, MII_RESV); ++ if (revision == SIS630A_900_REV && ++ (host_bridge_rev == SIS630B0 || host_bridge_rev == SIS630B1)) ++ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, (reg14h | 0x2200) & 0xBFFF); ++ else ++ mdio_write(net_dev, sis_priv->cur_phy, MII_RESV, (reg14h | 0x2000) & 0xBFFF); ++ } ++ return; ++} ++ ++ ++/* on each timer ticks we check two things, Link Status (ON/OFF) and ++ Link Mode (10/100/Full/Half) ++*/ ++static void sis900_timer(unsigned long data) ++{ ++ struct device *net_dev = (struct device *)data; ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ struct mii_phy *mii_phy = sis_priv->mii; ++ static int next_tick = 5*HZ; ++ u16 status; ++ u8 revision; ++ ++ if(!sis_priv->autong_complete){ ++ int speed, duplex = 0; ++ ++ sis900_read_mode(net_dev, &speed, &duplex); ++ if(duplex){ ++ sis900_set_mode(net_dev->base_addr, speed, duplex); ++ pcibios_read_config_byte(sis_priv->pci_bus, sis_priv->pci_device_fn, PCI_CLASS_REVISION, &revision); ++ sis630_set_eq(net_dev, revision); ++ } ++ ++ sis_priv->timer.expires = jiffies + HZ; ++ add_timer(&sis_priv->timer); ++ return; ++ } ++ ++ status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS); ++ status = mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS); ++ ++ /* Link OFF -> ON */ ++ if ( !sis_priv->LinkOn ) { ++LookForLink: ++ /* Search for new PHY */ ++ status = sis900_default_phy( net_dev ); ++ mii_phy = sis_priv->mii; ++ ++ if( status & MII_STAT_LINK ){ ++ sis900_check_mode(net_dev, mii_phy); ++ sis_priv->LinkOn = TRUE; ++ } ++ } ++ /* Link ON -> OFF */ ++ else{ ++ if( !(status & MII_STAT_LINK) ){ ++ sis_priv->LinkOn = FALSE; ++ printk(KERN_INFO "%s: Media Link Off\n", net_dev->name); ++ ++ /* Change mode issue */ ++ if( (mii_phy->phy_id0 == 0x001D) && ++ ( (mii_phy->phy_id1 & 0xFFF0) == 0x8000 )) ++ sis900_reset_phy( net_dev, sis_priv->cur_phy ); ++ ++ pcibios_read_config_byte(sis_priv->pci_bus, sis_priv->pci_device_fn, PCI_CLASS_REVISION, &revision); ++ sis630_set_eq(net_dev, revision); ++ ++ goto LookForLink; ++ } ++ } ++ ++ sis_priv->timer.expires = jiffies + next_tick; ++ add_timer(&sis_priv->timer); ++} ++ ++static void sis900_check_mode (struct device *net_dev, struct mii_phy *mii_phy) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ int speed, duplex; ++ ++ if( mii_phy->phy_types == LAN ){ ++ outl( ~EXD & inl( ioaddr + cfg ), ioaddr + cfg); ++ sis900_set_capability(net_dev , mii_phy); ++ sis900_auto_negotiate(net_dev, sis_priv->cur_phy); ++ }else{ ++ outl(EXD | inl( ioaddr + cfg ), ioaddr + cfg); ++ speed = HW_SPEED_HOME; ++ duplex = FDX_CAPABLE_HALF_SELECTED; ++ sis900_set_mode(net_dev->base_addr, speed, duplex); ++ sis_priv->autong_complete = 1; ++ } ++} ++ ++static void sis900_set_mode (long ioaddr, int speed, int duplex) ++{ ++ u32 tx_flags = 0, rx_flags = 0; ++ ++ if( inl(ioaddr + cfg) & EDB_MASTER_EN ){ ++ tx_flags = TxATP | (DMA_BURST_64 << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift); ++ rx_flags = DMA_BURST_64 << RxMXDMA_shift; ++ } ++ else{ ++ tx_flags = TxATP | (DMA_BURST_512 << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift); ++ rx_flags = DMA_BURST_512 << RxMXDMA_shift; ++ } ++ ++ if (speed == HW_SPEED_HOME || speed == HW_SPEED_10_MBPS ) { ++ rx_flags |= (RxDRNT_10 << RxDRNT_shift); ++ tx_flags |= (TxDRNT_10 << TxDRNT_shift); ++ } ++ else { ++ rx_flags |= (RxDRNT_100 << RxDRNT_shift); ++ tx_flags |= (TxDRNT_100 << TxDRNT_shift); ++ } ++ ++ if (duplex == FDX_CAPABLE_FULL_SELECTED) { ++ tx_flags |= (TxCSI | TxHBI); ++ rx_flags |= RxATX; ++ } ++ ++ outl (tx_flags, ioaddr + txcfg); ++ outl (rx_flags, ioaddr + rxcfg); ++} ++ ++ ++static void sis900_auto_negotiate(struct device *net_dev, int phy_addr) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ int i = 0; ++ u32 status; ++ ++ while (i++ < 2) ++ status = mdio_read(net_dev, phy_addr, MII_STATUS); ++ ++ if (!(status & MII_STAT_LINK)){ ++ printk(KERN_INFO "%s: Media Link Off\n", net_dev->name); ++ sis_priv->autong_complete = 1; ++ sis_priv->LinkOn = FALSE; ++ return; ++ } ++ ++ /* (Re)start AutoNegotiate */ ++ mdio_write(net_dev, phy_addr, MII_CONTROL, ++ MII_CNTL_AUTO | MII_CNTL_RST_AUTO); ++ sis_priv->autong_complete = 0; ++} ++ ++ ++static void sis900_read_mode(struct device *net_dev, int *speed, int *duplex) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ struct mii_phy *phy = sis_priv->mii; ++ int phy_addr = sis_priv->cur_phy; ++ u32 status; ++ u16 autoadv, autorec; ++ int i = 0; ++ ++ while (i++ < 2) ++ status = mdio_read(net_dev, phy_addr, MII_STATUS); ++ ++ if (!(status & MII_STAT_LINK)) return; ++ ++ /* AutoNegotiate completed */ ++ autoadv = mdio_read(net_dev, phy_addr, MII_ANADV); ++ autorec = mdio_read(net_dev, phy_addr, MII_ANLPAR); ++ status = autoadv & autorec; ++ ++ *speed = HW_SPEED_10_MBPS; ++ *duplex = FDX_CAPABLE_HALF_SELECTED; ++ ++ if (status & (MII_NWAY_TX | MII_NWAY_TX_FDX)) ++ *speed = HW_SPEED_100_MBPS; ++ if (status & ( MII_NWAY_TX_FDX | MII_NWAY_T_FDX)) ++ *duplex = FDX_CAPABLE_FULL_SELECTED; ++ ++ sis_priv->autong_complete = 1; ++ ++ /* Workaround for Realtek RTL8201 PHY issue */ ++ if((phy->phy_id0 == 0x0000) && ((phy->phy_id1 & 0xFFF0) == 0x8200)){ ++ if(mdio_read(net_dev, phy_addr, MII_CONTROL) & MII_CNTL_FDX) ++ *duplex = FDX_CAPABLE_FULL_SELECTED; ++ if(mdio_read(net_dev, phy_addr, 0x0019) & 0x01) ++ *speed = HW_SPEED_100_MBPS; ++ } ++ ++ printk(KERN_INFO "%s: Media Link On %s %s-duplex \n", ++ net_dev->name, ++ *speed == HW_SPEED_100_MBPS ? ++ "100mbps" : "10mbps", ++ *duplex == FDX_CAPABLE_FULL_SELECTED ? ++ "full" : "half"); ++} ++ ++ ++static void sis900_tx_timeout(struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ int i; ++ ++ printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x \n", ++ net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr)); ++ ++ /* Disable interrupts by clearing the interrupt mask. */ ++ outl(0x0000, ioaddr + imr); ++ ++ /* discard unsent packets, should this code section be protected by ++ cli(), sti() ?? */ ++ sis_priv->dirty_tx = sis_priv->cur_tx = 0; ++ for (i = 0; i < NUM_TX_DESC; i++) { ++ if (sis_priv->tx_skbuff[i] != NULL) { ++ dev_free_skb(sis_priv->tx_skbuff[i]); ++ sis_priv->tx_skbuff[i] = 0; ++ sis_priv->tx_ring[i].cmdsts = 0; ++ sis_priv->tx_ring[i].bufptr = 0; ++ sis_priv->stats.tx_dropped++; ++ } ++ } ++ net_dev->trans_start = jiffies; ++ net_dev->tbusy = sis_priv->tx_full = 0; ++ ++ /* FIXME: Should we restart the transmission thread here ?? */ ++ outl(TxENA | inl(ioaddr + cr), ioaddr + cr); ++ ++ /* Enable all known interrupts by setting the interrupt mask. */ ++ outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr); ++ return; ++} ++ ++static int ++sis900_start_xmit(struct sk_buff *skb, struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ unsigned int entry; ++ ++ /* test tbusy to see if we have timeout situation then set it */ ++ if (test_and_set_bit(0, (void*)&net_dev->tbusy) != 0) { ++ if (jiffies - net_dev->trans_start > TX_TIMEOUT) ++ sis900_tx_timeout(net_dev); ++ return 1; ++ } ++ ++ /* Calculate the next Tx descriptor entry. */ ++ entry = sis_priv->cur_tx % NUM_TX_DESC; ++ sis_priv->tx_skbuff[entry] = skb; ++ ++ /* set the transmit buffer descriptor and enable Transmit State Machine */ ++ sis_priv->tx_ring[entry].bufptr = virt_to_bus(skb->data); ++ sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len); ++ outl(TxENA | inl(ioaddr + cr), ioaddr + cr); ++ ++ if (++sis_priv->cur_tx - sis_priv->dirty_tx < NUM_TX_DESC) { ++ /* Typical path, clear tbusy to indicate more ++ transmission is possible */ ++ clear_bit(0, (void*)&net_dev->tbusy); ++ } else { ++ /* no more transmit descriptor avaiable, tbusy remain set */ ++ sis_priv->tx_full = 1; ++ } ++ ++ net_dev->trans_start = jiffies; ++ ++ { ++ int i; ++ for (i = 0; i < 100000; i++); /* GRUIIIIIK */ ++ } ++ ++ if (sis900_debug > 3) ++ printk(KERN_INFO "%s: Queued Tx packet at %p size %d " ++ "to slot %d.\n", ++ net_dev->name, skb->data, (int)skb->len, entry); ++ ++ return 0; ++} ++ ++/* The interrupt handler does all of the Rx thread work and cleans up ++ after the Tx thread. */ ++static void sis900_interrupt(int irq, void *dev_instance, struct pt_regs *regs) ++{ ++ struct device *net_dev = (struct device *)dev_instance; ++ int boguscnt = max_interrupt_work; ++ long ioaddr = net_dev->base_addr; ++ u32 status; ++ ++#if defined(__i386__) ++ /* A lock to prevent simultaneous entry bug on Intel SMP machines. */ ++ if (test_and_set_bit(0, (void*)&net_dev->interrupt)) { ++ printk(KERN_INFO "%s: SMP simultaneous entry of " ++ "an interrupt handler.\n", net_dev->name); ++ net_dev->interrupt = 0; /* Avoid halting machine. */ ++ return; ++ } ++#else ++ if (net_dev->interrupt) { ++ printk(KERN_INFO "%s: Re-entering the interrupt handler.\n", ++ net_dev->name); ++ return; ++ } ++ net_dev->interrupt = 1; ++#endif ++ ++ do { ++ status = inl(ioaddr + isr); ++ ++ if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0) ++ /* nothing intresting happened */ ++ break; ++ ++ /* why dow't we break after Tx/Rx case ?? keyword: full-duplex */ ++ if (status & (RxORN | RxERR | RxOK)) ++ /* Rx interrupt */ ++ sis900_rx(net_dev); ++ ++ if (status & (TxURN | TxERR | TxIDLE)) ++ /* Tx interrupt */ ++ sis900_finish_xmit(net_dev); ++ ++ /* something strange happened !!! */ ++ if (status & HIBERR) { ++ printk(KERN_INFO "%s: Abnormal interrupt," ++ "status %#8.8x.\n", net_dev->name, status); ++ break; ++ } ++ if (--boguscnt < 0) { ++ printk(KERN_INFO "%s: Too much work at interrupt, " ++ "interrupt status = %#8.8x.\n", ++ net_dev->name, status); ++ break; ++ } ++ } while (1); ++ ++ if (sis900_debug > 4) ++ printk(KERN_INFO "%s: exiting interrupt, " ++ "interrupt status = 0x%#8.8x.\n", ++ net_dev->name, inl(ioaddr + isr)); ++ ++#if defined(__i386__) ++ clear_bit(0, (void*)&net_dev->interrupt); ++#else ++ net_dev->interrupt = 0; ++#endif ++ return; ++} ++ ++/* Process receive interrupt events, put buffer to higher layer and refill buffer pool ++ Note: This fucntion is called by interrupt handler, don't do "too much" work here */ ++static int sis900_rx(struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ long ioaddr = net_dev->base_addr; ++ unsigned int entry = sis_priv->cur_rx % NUM_RX_DESC; ++ u32 rx_status = sis_priv->rx_ring[entry].cmdsts; ++ ++ if (sis900_debug > 4) ++ printk(KERN_INFO "sis900_rx, cur_rx:%4.4d, dirty_rx:%4.4d " ++ "status:0x%8.8x\n", ++ sis_priv->cur_rx, sis_priv->dirty_rx, rx_status); ++ ++ while (rx_status & OWN) { ++ unsigned int rx_size; ++ ++ rx_size = (rx_status & DSIZE) - CRC_SIZE; ++ ++ if (rx_status & (ABORT|OVERRUN|TOOLONG|RUNT|RXISERR|CRCERR|FAERR)) { ++ /* corrupted packet received */ ++ if (sis900_debug > 4) ++ printk(KERN_INFO "%s: Corrupted packet " ++ "received, buffer status = 0x%8.8x.\n", ++ net_dev->name, rx_status); ++ sis_priv->stats.rx_errors++; ++ if (rx_status & OVERRUN) ++ sis_priv->stats.rx_over_errors++; ++ if (rx_status & (TOOLONG|RUNT)) ++ sis_priv->stats.rx_length_errors++; ++ if (rx_status & (RXISERR | FAERR)) ++ sis_priv->stats.rx_frame_errors++; ++ if (rx_status & CRCERR) ++ sis_priv->stats.rx_crc_errors++; ++ /* reset buffer descriptor state */ ++ sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE; ++ } else { ++ struct sk_buff * skb; ++ ++ /* This situation should never happen, but due to ++ some unknow bugs, it is possible that ++ we are working on NULL sk_buff :-( */ ++ if (sis_priv->rx_skbuff[entry] == NULL) { ++ printk(KERN_INFO "%s: NULL pointer " ++ "encountered in Rx ring, skipping\n", ++ net_dev->name); ++ break; ++ } ++ ++ /* gvie the socket buffer to upper layers */ ++ skb = sis_priv->rx_skbuff[entry]; ++ skb_put(skb, rx_size); ++ skb->protocol = eth_type_trans(skb, net_dev); ++ netif_rx(skb); ++ ++ /* some network statistics */ ++ if ((rx_status & BCAST) == MCAST) ++ sis_priv->stats.multicast++; ++ net_dev->last_rx = jiffies; ++ /* sis_priv->stats.rx_bytes += rx_size;*/ ++ sis_priv->stats.rx_packets++; ++ ++ /* refill the Rx buffer, what if there is not enought memory for ++ new socket buffer ?? */ ++ if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { ++ /* not enough memory for skbuff, this makes a "hole" ++ on the buffer ring, it is not clear how the ++ hardware will react to this kind of degenerated ++ buffer */ ++ printk(KERN_INFO "%s: Memory squeeze," ++ "deferring packet.\n", ++ net_dev->name); ++ sis_priv->rx_skbuff[entry] = NULL; ++ /* reset buffer descriptor state */ ++ sis_priv->rx_ring[entry].cmdsts = 0; ++ sis_priv->rx_ring[entry].bufptr = 0; ++ sis_priv->stats.rx_dropped++; ++ break; ++ } ++ skb->dev = net_dev; ++ sis_priv->rx_skbuff[entry] = skb; ++ sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE; ++ sis_priv->rx_ring[entry].bufptr = virt_to_bus(skb->tail); ++ sis_priv->dirty_rx++; ++ } ++ sis_priv->cur_rx++; ++ entry = sis_priv->cur_rx % NUM_RX_DESC; ++ rx_status = sis_priv->rx_ring[entry].cmdsts; ++ } // while ++ ++ /* refill the Rx buffer, what if the rate of refilling is slower than ++ consuming ?? */ ++ for (;sis_priv->cur_rx - sis_priv->dirty_rx > 0; sis_priv->dirty_rx++) { ++ struct sk_buff *skb; ++ ++ entry = sis_priv->dirty_rx % NUM_RX_DESC; ++ ++ if (sis_priv->rx_skbuff[entry] == NULL) { ++ if ((skb = dev_alloc_skb(RX_BUF_SIZE)) == NULL) { ++ /* not enough memory for skbuff, this makes a "hole" ++ on the buffer ring, it is not clear how the ++ hardware will react to this kind of degenerated ++ buffer */ ++ printk(KERN_INFO "%s: Memory squeeze," ++ "deferring packet.\n", ++ net_dev->name); ++ sis_priv->stats.rx_dropped++; ++ break; ++ } ++ skb->dev = net_dev; ++ sis_priv->rx_skbuff[entry] = skb; ++ sis_priv->rx_ring[entry].cmdsts = RX_BUF_SIZE; ++ sis_priv->rx_ring[entry].bufptr = virt_to_bus(skb->tail); ++ } ++ } ++ ++ /* re-enable the potentially idle receive state matchine */ ++ outl(RxENA | inl(ioaddr + cr), ioaddr + cr ); ++ ++ return 0; ++} ++ ++/* finish up transmission of packets, check for error condition and free skbuff etc. ++ Note: This fucntion is called by interrupt handler, don't do "too much" work here */ ++static void sis900_finish_xmit (struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ ++ for (; sis_priv->dirty_tx < sis_priv->cur_tx; sis_priv->dirty_tx++) { ++ unsigned int entry; ++ u32 tx_status; ++ ++ entry = sis_priv->dirty_tx % NUM_TX_DESC; ++ tx_status = sis_priv->tx_ring[entry].cmdsts; ++ ++ if (tx_status & OWN) { ++ /* The packet is not transmitted yet (owned by hardware) ! ++ Note: the interrupt is generated only when Tx Machine ++ is idle, so this is an almost impossible case */ ++ break; ++ } ++ ++ if (tx_status & (ABORT | UNDERRUN | OWCOLL)) { ++ /* packet unsuccessfully transmitted */ ++ if (sis900_debug > 4) ++ printk(KERN_INFO "%s: Transmit " ++ "error, Tx status %8.8x.\n", ++ net_dev->name, tx_status); ++ sis_priv->stats.tx_errors++; ++ if (tx_status & UNDERRUN) ++ sis_priv->stats.tx_fifo_errors++; ++ if (tx_status & ABORT) ++ sis_priv->stats.tx_aborted_errors++; ++ if (tx_status & NOCARRIER) ++ sis_priv->stats.tx_carrier_errors++; ++ if (tx_status & OWCOLL) ++ sis_priv->stats.tx_window_errors++; ++ } else { ++ /* packet successfully transmitted */ ++ sis_priv->stats.collisions += (tx_status & COLCNT) >> 16; ++ /* sis_priv->stats.tx_bytes += tx_status & DSIZE;*/ ++ sis_priv->stats.tx_packets++; ++ } ++ /* Free the original skb. */ ++ dev_free_skb(sis_priv->tx_skbuff[entry]); ++ sis_priv->tx_skbuff[entry] = NULL; ++ sis_priv->tx_ring[entry].bufptr = 0; ++ sis_priv->tx_ring[entry].cmdsts = 0; ++ } ++ ++ if (sis_priv->tx_full && net_dev->tbusy && ++ sis_priv->cur_tx - sis_priv->dirty_tx < NUM_TX_DESC - 4) { ++ /* The ring is no longer full, clear tbusy, tx_full and ++ schedule more transmission by marking NET_BH */ ++ sis_priv->tx_full = 0; ++ clear_bit(0, (void *)&net_dev->tbusy); ++ mark_bh(NET_BH); ++ } ++} ++ ++static int ++sis900_close(struct device *net_dev) ++{ ++ long ioaddr = net_dev->base_addr; ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ int i; ++ ++ net_dev->start = 0; ++ net_dev->tbusy = 1; ++ ++ /* Disable interrupts by clearing the interrupt mask. */ ++ outl(0x0000, ioaddr + imr); ++ outl(0x0000, ioaddr + ier); ++ ++ /* Stop the chip's Tx and Rx Status Machine */ ++ outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr); ++ ++ del_timer(&sis_priv->timer); ++ ++ free_irq(net_dev->irq, net_dev); ++ ++ /* Free Tx and RX skbuff */ ++ for (i = 0; i < NUM_RX_DESC; i++) { ++ if (sis_priv->rx_skbuff[i] != NULL) ++ dev_free_skb(sis_priv->rx_skbuff[i]); ++ sis_priv->rx_skbuff[i] = 0; ++ } ++ for (i = 0; i < NUM_TX_DESC; i++) { ++ if (sis_priv->tx_skbuff[i] != NULL) ++ dev_free_skb(sis_priv->tx_skbuff[i]); ++ sis_priv->tx_skbuff[i] = 0; ++ } ++ ++ /* Green! Put the chip in low-power mode. */ ++ ++ MOD_DEC_USE_COUNT; ++ ++ return 0; ++} ++ ++static int mii_ioctl(struct device *net_dev, struct ifreq *rq, int cmd) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ u16 *data = (u16 *)&rq->ifr_data; ++ ++ switch(cmd) { ++ case SIOCDEVPRIVATE: /* Get the address of the PHY in use. */ ++ data[0] = sis_priv->mii->phy_addr; ++ /* Fall Through */ ++ case SIOCDEVPRIVATE+1: /* Read the specified MII register. */ ++ data[3] = mdio_read(net_dev, data[0] & 0x1f, data[1] & 0x1f); ++ return 0; ++ case SIOCDEVPRIVATE+2: /* Write the specified MII register */ ++ if (!suser()) ++ return -EPERM; ++ mdio_write(net_dev, data[0] & 0x1f, data[1] & 0x1f, data[2]); ++ return 0; ++ default: ++ return -EOPNOTSUPP; ++ } ++} ++ ++static struct enet_statistics * ++sis900_get_stats(struct device *net_dev) ++{ ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ ++ return &sis_priv->stats; ++} ++ ++ ++/* SiS 900 uses the most sigificant 7 bits to index a 128 bits multicast ++ * hash table, which makes this function a little bit different from other drivers ++ * SiS 900 B0 & 635 M/B uses the most significat 8 bits to index 256 bits ++ * multicast hash table. ++ */ ++static u16 sis900_compute_hashtable_index(u8 *addr, u8 revision) ++{ ++ ++/* what is the correct value of the POLYNOMIAL ?? ++ Donald Becker use 0x04C11DB7U ++ Joseph Zbiciak im14u2c@primenet.com gives me the ++ correct answer, thank you Joe !! */ ++#define POLYNOMIAL 0x04C11DB7L ++ u32 crc = 0xffffffff, msb; ++ int i, j; ++ u32 byte; ++ ++ for (i = 0; i < 6; i++) { ++ byte = *addr++; ++ for (j = 0; j < 8; j++) { ++ msb = crc >> 31; ++ crc <<= 1; ++ if (msb ^ (byte & 1)) { ++ crc ^= POLYNOMIAL; ++ } ++ byte >>= 1; ++ } ++ } ++ ++ /* leave 8 or 7 most siginifant bits */ ++ if((revision >= SIS635A_900_REV) || (revision == SIS900B_900_REV)) ++ return ((int)(crc >> 24)); ++ else ++ return ((int)(crc >> 25)); ++} ++ ++static void set_rx_mode(struct device *net_dev) ++{ ++ long ioaddr = net_dev->base_addr; ++ struct sis900_private * sis_priv = (struct sis900_private *)net_dev->priv; ++ u16 mc_filter[16] = {0}; /* 256/128 bits multicast hash table */ ++ int i, table_entries; ++ u32 rx_mode; ++ u8 revision; ++ ++ /* 635 Hash Table entires = 256(2^16) */ ++ pcibios_read_config_byte(sis_priv->pci_bus, sis_priv->pci_device_fn, PCI_CLASS_REVISION, &revision); ++ if((revision >= SIS635A_900_REV) || (revision == SIS900B_900_REV)) ++ table_entries = 16; ++ else ++ table_entries = 8; ++ ++ if (net_dev->flags & IFF_PROMISC) { ++ /* Accept any kinds of packets */ ++ rx_mode = RFPromiscuous; ++ for (i = 0; i < table_entries; i++) ++ mc_filter[i] = 0xffff; ++ } else if ((net_dev->mc_count > multicast_filter_limit) || ++ (net_dev->flags & IFF_ALLMULTI)) { ++ /* too many multicast addresses or accept all multicast packets */ ++ rx_mode = RFAAB | RFAAM; ++ for (i = 0; i < table_entries; i++) ++ mc_filter[i] = 0xffff; ++ } else { ++ /* Accept Broadcast packets, destination addresses match our MAC address, ++ use Receive Filter to reject unwanted MCAST packets */ ++ struct dev_mc_list *mclist; ++ rx_mode = RFAAB; ++ for (i = 0, mclist = net_dev->mc_list; mclist && i < net_dev->mc_count; ++ i++, mclist = mclist->next) ++ set_bit(sis900_compute_hashtable_index(mclist->dmi_addr, revision), ++ mc_filter); ++ } ++ ++ /* update Multicast Hash Table in Receive Filter */ ++ for (i = 0; i < table_entries; i++) { ++ /* why plus 0x04 ??, That makes the correct value for hash table. */ ++ outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr); ++ outl(mc_filter[i], ioaddr + rfdr); ++ } ++ ++ outl(RFEN | rx_mode, ioaddr + rfcr); ++ ++ /* sis900 is capatable of looping back packet at MAC level for debugging purpose */ ++ if (net_dev->flags & IFF_LOOPBACK) { ++ u32 cr_saved; ++ /* We must disable Tx/Rx before setting loopback mode */ ++ cr_saved = inl(ioaddr + cr); ++ outl(cr_saved | TxDIS | RxDIS, ioaddr + cr); ++ /* enable loopback */ ++ outl(inl(ioaddr + txcfg) | TxMLB, ioaddr + txcfg); ++ outl(inl(ioaddr + rxcfg) | RxATX, ioaddr + rxcfg); ++ /* restore cr */ ++ outl(cr_saved, ioaddr + cr); ++ } ++ ++ return; ++} ++ ++static void sis900_reset(struct device *net_dev) ++{ ++ long ioaddr = net_dev->base_addr; ++ struct sis900_private *sis_priv = (struct sis900_private *)net_dev->priv; ++ int i = 0; ++ u8 revision; ++ u32 status = TxRCMP | RxRCMP; ++ ++ outl(0, ioaddr + ier); ++ outl(0, ioaddr + imr); ++ outl(0, ioaddr + rfcr); ++ ++ outl(RxRESET | TxRESET | RESET | inl(ioaddr + cr), ioaddr + cr); ++ ++ /* Check that the chip has finished the reset. */ ++ while (status && (i++ < 1000)) { ++ status ^= (inl(isr + ioaddr) & status); ++ } ++ ++ pcibios_read_config_byte(sis_priv->pci_bus, sis_priv->pci_device_fn, PCI_CLASS_REVISION, &revision); ++ if( (revision >= SIS635A_900_REV) || (revision == SIS900B_900_REV) ) ++ outl(PESEL | RND_CNT, ioaddr + cfg); ++ else ++ outl(PESEL, ioaddr + cfg); ++} ++ ++#ifdef MODULE ++int init_module(void) ++{ ++ return sis900_probe(NULL); ++} ++ ++void ++cleanup_module(void) ++{ ++ /* No need to check MOD_IN_USE, as sys_delete_module() checks. */ ++ while (root_sis900_dev) { ++ struct sis900_private *sis_priv = ++ (struct sis900_private *)root_sis900_dev->priv; ++ struct device *next_dev = sis_priv->next_module; ++ struct mii_phy *phy = NULL; ++ ++ while(sis_priv->first_mii){ ++ phy = sis_priv->first_mii; ++ sis_priv->first_mii = phy->next; ++ kfree(phy); ++ } ++ ++ unregister_netdev(root_sis900_dev); ++ release_region(root_sis900_dev->base_addr, ++ sis_priv->mac->io_size); ++ kfree(sis_priv); ++ kfree(root_sis900_dev); ++ ++ root_sis900_dev = next_dev; ++ } ++} ++ ++#endif /* MODULE */ +diff -ruN gnumach.orig/linux/src/drivers/net/sis900.h gnumach.sis900/linux/src/drivers/net/sis900.h +--- gnumach.orig/linux/src/drivers/net/sis900.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnumach.sis900/linux/src/drivers/net/sis900.h 2005-03-26 21:08:35.000000000 +0100 +@@ -0,0 +1,284 @@ ++/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900 ++ * Copyright 1999 Silicon Integrated System Corporation ++ * References: ++ * SiS 7016 Fast Ethernet PCI Bus 10/100 Mbps LAN Controller with OnNow Support, ++ * preliminary Rev. 1.0 Jan. 14, 1998 ++ * SiS 900 Fast Ethernet PCI Bus 10/100 Mbps LAN Single Chip with OnNow Support, ++ * preliminary Rev. 1.0 Nov. 10, 1998 ++ * SiS 7014 Single Chip 100BASE-TX/10BASE-T Physical Layer Solution, ++ * preliminary Rev. 1.0 Jan. 18, 1998 ++ * http://www.sis.com.tw/support/databook.htm ++ */ ++ ++/* MAC operationl registers of SiS 7016 and SiS 900 ehternet controller */ ++/* The I/O extent, SiS 900 needs 256 bytes of io address */ ++#define SIS900_TOTAL_SIZE 0x100 ++ ++/* Symbolic offsets to registers. */ ++enum sis900_registers { ++ cr=0x0, //Command Register ++ cfg=0x4, //Configuration Register ++ mear=0x8, //EEPROM Access Register ++ ptscr=0xc, //PCI Test Control Register ++ isr=0x10, //Interrupt Status Register ++ imr=0x14, //Interrupt Mask Register ++ ier=0x18, //Interrupt Enable Register ++ epar=0x18, //Enhanced PHY Access Register ++ txdp=0x20, //Transmit Descriptor Pointer Register ++ txcfg=0x24, //Transmit Configuration Register ++ rxdp=0x30, //Receive Descriptor Pointer Register ++ rxcfg=0x34, //Receive Configuration Register ++ flctrl=0x38, //Flow Control Register ++ rxlen=0x3c, //Receive Packet Length Register ++ rfcr=0x48, //Receive Filter Control Register ++ rfdr=0x4C, //Receive Filter Data Register ++ pmctrl=0xB0, //Power Management Control Register ++ pmer=0xB4 //Power Management Wake-up Event Register ++}; ++ ++/* Symbolic names for bits in various registers */ ++enum sis900_command_register_bits { ++ RELOAD = 0x00000400, ACCESSMODE = 0x00000200,/* ET */ ++ RESET = 0x00000100, SWI = 0x00000080, RxRESET = 0x00000020, ++ TxRESET = 0x00000010, RxDIS = 0x00000008, RxENA = 0x00000004, ++ TxDIS = 0x00000002, TxENA = 0x00000001 ++}; ++ ++enum sis900_configuration_register_bits { ++ DESCRFMT = 0x00000100 /* 7016 specific */, REQALG = 0x00000080, ++ SB = 0x00000040, POW = 0x00000020, EXD = 0x00000010, ++ PESEL = 0x00000008, LPM = 0x00000004, BEM = 0x00000001, ++ /* 635 & 900B Specific */ ++ RND_CNT = 0x00000400, FAIR_BACKOFF = 0x00000200, ++ EDB_MASTER_EN = 0x00002000 ++}; ++ ++enum sis900_eeprom_access_reigster_bits { ++ MDC = 0x00000040, MDDIR = 0x00000020, MDIO = 0x00000010, /* 7016 specific */ ++ EECS = 0x00000008, EECLK = 0x00000004, EEDO = 0x00000002, ++ EEDI = 0x00000001 ++}; ++ ++enum sis900_interrupt_register_bits { ++ WKEVT = 0x10000000, TxPAUSEEND = 0x08000000, TxPAUSE = 0x04000000, ++ TxRCMP = 0x02000000, RxRCMP = 0x01000000, DPERR = 0x00800000, ++ SSERR = 0x00400000, RMABT = 0x00200000, RTABT = 0x00100000, ++ RxSOVR = 0x00010000, HIBERR = 0x00008000, SWINT = 0x00001000, ++ MIBINT = 0x00000800, TxURN = 0x00000400, TxIDLE = 0x00000200, ++ TxERR = 0x00000100, TxDESC = 0x00000080, TxOK = 0x00000040, ++ RxORN = 0x00000020, RxIDLE = 0x00000010, RxEARLY = 0x00000008, ++ RxERR = 0x00000004, RxDESC = 0x00000002, RxOK = 0x00000001 ++}; ++ ++enum sis900_interrupt_enable_reigster_bits { ++ IE = 0x00000001 ++}; ++ ++/* maximum dma burst fro transmission and receive*/ ++#define MAX_DMA_RANGE 7 /* actually 0 means MAXIMUM !! */ ++#define TxMXDMA_shift 20 ++#define RxMXDMA_shift 20 ++ ++enum sis900_tx_rx_dma{ ++ DMA_BURST_512 = 0, DMA_BURST_64 = 5 ++}; ++ ++/* transmit FIFO threshholds */ ++#define TX_FILL_THRESH 16 /* 1/4 FIFO size */ ++#define TxFILLT_shift 8 ++#define TxDRNT_shift 0 ++#define TxDRNT_100 48 /* 3/4 FIFO size */ ++#define TxDRNT_10 16 /* 1/2 FIFO size */ ++ ++enum sis900_transmit_config_register_bits { ++ TxCSI = 0x80000000, TxHBI = 0x40000000, TxMLB = 0x20000000, ++ TxATP = 0x10000000, TxIFG = 0x0C000000, TxFILLT = 0x00003F00, ++ TxDRNT = 0x0000003F ++}; ++ ++/* recevie FIFO thresholds */ ++#define RxDRNT_shift 1 ++#define RxDRNT_100 16 /* 1/2 FIFO size */ ++#define RxDRNT_10 24 /* 3/4 FIFO size */ ++ ++enum sis900_reveive_config_register_bits { ++ RxAEP = 0x80000000, RxARP = 0x40000000, RxATX = 0x10000000, ++ RxAJAB = 0x08000000, RxDRNT = 0x0000007F ++}; ++ ++#define RFAA_shift 28 ++#define RFADDR_shift 16 ++ ++enum sis900_receive_filter_control_register_bits { ++ RFEN = 0x80000000, RFAAB = 0x40000000, RFAAM = 0x20000000, ++ RFAAP = 0x10000000, RFPromiscuous = (RFAAB|RFAAM|RFAAP) ++}; ++ ++enum sis900_reveive_filter_data_mask { ++ RFDAT = 0x0000FFFF ++}; ++ ++/* EEPROM Addresses */ ++enum sis900_eeprom_address { ++ EEPROMSignature = 0x00, EEPROMVendorID = 0x02, EEPROMDeviceID = 0x03, ++ EEPROMMACAddr = 0x08, EEPROMChecksum = 0x0b ++}; ++ ++/* The EEPROM commands include the alway-set leading bit. Refer to NM93Cxx datasheet */ ++enum sis900_eeprom_command { ++ EEread = 0x0180, EEwrite = 0x0140, EEerase = 0x01C0, ++ EEwriteEnable = 0x0130, EEwriteDisable = 0x0100, ++ EEeraseAll = 0x0120, EEwriteAll = 0x0110, ++ EEaddrMask = 0x013F, EEcmdShift = 16 ++}; ++ ++/* For SiS962, request the eeprom software access */ ++enum sis962_eeprom_command { ++ EEREQ = 0x00000400, EEDONE = 0x00000200, EEGNT = 0x00000100 ++}; ++ ++/* Manamgement Data I/O (mdio) frame */ ++#define MIIread 0x6000 ++#define MIIwrite 0x5002 ++#define MIIpmdShift 7 ++#define MIIregShift 2 ++#define MIIcmdLen 16 ++#define MIIcmdShift 16 ++ ++/* Buffer Descriptor Status*/ ++enum sis900_buffer_status { ++ OWN = 0x80000000, MORE = 0x40000000, INTR = 0x20000000, ++ SUPCRC = 0x10000000, INCCRC = 0x10000000, ++ OK = 0x08000000, DSIZE = 0x00000FFF ++}; ++/* Status for TX Buffers */ ++enum sis900_tx_buffer_status { ++ ABORT = 0x04000000, UNDERRUN = 0x02000000, NOCARRIER = 0x01000000, ++ DEFERD = 0x00800000, EXCDEFER = 0x00400000, OWCOLL = 0x00200000, ++ EXCCOLL = 0x00100000, COLCNT = 0x000F0000 ++}; ++ ++enum sis900_rx_bufer_status { ++ OVERRUN = 0x02000000, DEST = 0x00800000, BCAST = 0x01800000, ++ MCAST = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000, ++ RUNT = 0x00200000, RXISERR = 0x00100000, CRCERR = 0x00080000, ++ FAERR = 0x00040000, LOOPBK = 0x00020000, RXCOL = 0x00010000 ++}; ++ ++/* MII register offsets */ ++enum mii_registers { ++ MII_CONTROL = 0x0000, MII_STATUS = 0x0001, MII_PHY_ID0 = 0x0002, ++ MII_PHY_ID1 = 0x0003, MII_ANADV = 0x0004, MII_ANLPAR = 0x0005, ++ MII_ANEXT = 0x0006 ++}; ++ ++/* mii registers specific to SiS 900 */ ++enum sis_mii_registers { ++ MII_CONFIG1 = 0x0010, MII_CONFIG2 = 0x0011, MII_STSOUT = 0x0012, ++ MII_MASK = 0x0013, MII_RESV = 0x0014 ++}; ++ ++/* mii registers specific to ICS 1893 */ ++enum ics_mii_registers { ++ MII_EXTCTRL = 0x0010, MII_QPDSTS = 0x0011, MII_10BTOP = 0x0012, ++ MII_EXTCTRL2 = 0x0013 ++}; ++ ++/* mii registers specific to AMD 79C901 */ ++enum amd_mii_registers { ++ MII_STATUS_SUMMARY = 0x0018 ++}; ++ ++/* MII Control register bit definitions. */ ++enum mii_control_register_bits { ++ MII_CNTL_FDX = 0x0100, MII_CNTL_RST_AUTO = 0x0200, ++ MII_CNTL_ISOLATE = 0x0400, MII_CNTL_PWRDWN = 0x0800, ++ MII_CNTL_AUTO = 0x1000, MII_CNTL_SPEED = 0x2000, ++ MII_CNTL_LPBK = 0x4000, MII_CNTL_RESET = 0x8000 ++}; ++ ++/* MII Status register bit */ ++enum mii_status_register_bits { ++ MII_STAT_EXT = 0x0001, MII_STAT_JAB = 0x0002, ++ MII_STAT_LINK = 0x0004, MII_STAT_CAN_AUTO = 0x0008, ++ MII_STAT_FAULT = 0x0010, MII_STAT_AUTO_DONE = 0x0020, ++ MII_STAT_CAN_T = 0x0800, MII_STAT_CAN_T_FDX = 0x1000, ++ MII_STAT_CAN_TX = 0x2000, MII_STAT_CAN_TX_FDX = 0x4000, ++ MII_STAT_CAN_T4 = 0x8000 ++}; ++ ++#define MII_ID1_OUI_LO 0xFC00 /* low bits of OUI mask */ ++#define MII_ID1_MODEL 0x03F0 /* model number */ ++#define MII_ID1_REV 0x000F /* model number */ ++ ++/* MII NWAY Register Bits ... ++ valid for the ANAR (Auto-Negotiation Advertisement) and ++ ANLPAR (Auto-Negotiation Link Partner) registers */ ++enum mii_nway_register_bits { ++ MII_NWAY_NODE_SEL = 0x001f, MII_NWAY_CSMA_CD = 0x0001, ++ MII_NWAY_T = 0x0020, MII_NWAY_T_FDX = 0x0040, ++ MII_NWAY_TX = 0x0080, MII_NWAY_TX_FDX = 0x0100, ++ MII_NWAY_T4 = 0x0200, MII_NWAY_PAUSE = 0x0400, ++ MII_NWAY_RF = 0x2000, MII_NWAY_ACK = 0x4000, ++ MII_NWAY_NP = 0x8000 ++}; ++ ++enum mii_stsout_register_bits { ++ MII_STSOUT_LINK_FAIL = 0x4000, ++ MII_STSOUT_SPD = 0x0080, MII_STSOUT_DPLX = 0x0040 ++}; ++ ++enum mii_stsics_register_bits { ++ MII_STSICS_SPD = 0x8000, MII_STSICS_DPLX = 0x4000, ++ MII_STSICS_LINKSTS = 0x0001 ++}; ++ ++enum mii_stssum_register_bits { ++ MII_STSSUM_LINK = 0x0008, MII_STSSUM_DPLX = 0x0004, ++ MII_STSSUM_AUTO = 0x0002, MII_STSSUM_SPD = 0x0001 ++}; ++ ++enum sis900_revision_id { ++ SIS630A_900_REV = 0x80, SIS630E_900_REV = 0x81, ++ SIS630S_900_REV = 0x82, SIS630EA1_900_REV = 0x83, ++ SIS630ET_900_REV = 0x84, SIS635A_900_REV = 0x90, ++ SIS962_900_REV = 0X91, SIS900B_900_REV = 0x03 ++}; ++ ++enum sis630_revision_id { ++ SIS630A0 = 0x00, SIS630A1 = 0x01, ++ SIS630B0 = 0x10, SIS630B1 = 0x11 ++}; ++ ++#define FDX_CAPABLE_DUPLEX_UNKNOWN 0 ++#define FDX_CAPABLE_HALF_SELECTED 1 ++#define FDX_CAPABLE_FULL_SELECTED 2 ++ ++#define HW_SPEED_UNCONFIG 0 ++#define HW_SPEED_HOME 1 ++#define HW_SPEED_10_MBPS 10 ++#define HW_SPEED_100_MBPS 100 ++#define HW_SPEED_DEFAULT (HW_SPEED_100_MBPS) ++ ++#define CRC_SIZE 4 ++#define MAC_HEADER_SIZE 14 ++ ++#define TX_BUF_SIZE 1536 ++#define RX_BUF_SIZE 1536 ++ ++#define NUM_TX_DESC 16 /* Number of Tx descriptor registers. */ ++#define NUM_RX_DESC 16 /* Number of Rx descriptor registers. */ ++ ++#define TRUE 1 ++#define FALSE 0 ++ ++/* PCI stuff, should be move to pic.h */ ++#define PCI_DEVICE_ID_SI_900 0x900 ++#define PCI_DEVICE_ID_SI_7016 0x7016 ++#define SIS630_VENDOR_ID 0x1039 ++#define SIS630_DEVICE_ID 0x0630 ++ ++/* ioctl for accessing MII transveiver */ ++#define SIOCGMIIPHY (SIOCDEVPRIVATE) /* Get the PHY in use. */ ++#define SIOCGMIIREG (SIOCDEVPRIVATE+1) /* Read a PHY register. */ ++#define SIOCSMIIREG (SIOCDEVPRIVATE+2) /* Write a PHY register */ + + +-- +To UNSUBSCRIBE, email to debian-hurd-REQUEST@lists.debian.org +with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org diff --git a/debian/patches/14_disable_fpe.patch b/debian/patches/14_disable_fpe.patch deleted file mode 100644 index f730686..0000000 --- a/debian/patches/14_disable_fpe.patch +++ /dev/null @@ -1,61 +0,0 @@ -#DPATCHLEVEL=1 - -2004-10-26 Guillem Jover <guillem@hadrons.org> - - * i386/i386/fpe.b: Remove binary without source. - * i386/i386/fpe.b_elf: Likewise. - * i386/i386/fpe_linkage.c: Disable the code if [! FPE]. - * i386/bogus/fpe.h: Add comment about not having an fpe implementation. - * i386/Makefrag (objfiles): Do not add fpe.o. - Remove targets to generate fpe.o. - - -diff -Naur gnumach-20040915.orig/i386/bogus/fpe.h gnumach-20040915/i386/bogus/fpe.h ---- gnumach-20040915.orig/i386/bogus/fpe.h 2001-06-25 18:28:26.000000000 +0200 -+++ gnumach-20040915/i386/bogus/fpe.h 2004-10-26 11:27:49.000000000 +0200 -@@ -1 +1,2 @@ -+/* We do not have a floating point implementation. */ - #define FPE 0 -diff -Naur gnumach-20040915.orig/i386/i386/fpe_linkage.c gnumach-20040915/i386/i386/fpe_linkage.c ---- gnumach-20040915.orig/i386/i386/fpe_linkage.c 1997-02-25 22:27:09.000000000 +0100 -+++ gnumach-20040915/i386/i386/fpe_linkage.c 2004-10-26 11:28:29.000000000 +0200 -@@ -30,6 +30,8 @@ - - #include <fpe.h> - -+#if FPE -+ - #include <cpus.h> - - #include <mach/std_types.h> -@@ -357,3 +359,5 @@ - } - exception(exc, code, subcode); - } -+#endif /* FPE. */ -+ -diff -Naur gnumach-20040915.orig/i386/Makefrag gnumach-20040915/i386/Makefrag ---- gnumach-20040915.orig/i386/Makefrag 2000-11-26 15:33:20.000000000 +0100 -+++ gnumach-20040915/i386/Makefrag 2004-10-26 11:27:49.000000000 +0200 -@@ -40,9 +40,6 @@ - objfiles += busses.o cirbuf.o - vpath busses.c $(srcdir)/chips - --# FPE emulation --objfiles += fpe.o -- - # Mig-generated - objfiles += mach_i386_server.o - -@@ -132,11 +129,3 @@ - rpc.h syscall_sw.h \ - thread_status.h trap.h vm_param.h \ - vm_types.h) -- -- --# Cheat, cheat, cheat. --fpe.o: fpe.b_elf -- uudecode $< --vpath fpe.b_elf $(sysdep)/i386 -- --fpe.d:; touch $@ diff --git a/debian/patches/15_disable_qlogic_firmware.patch b/debian/patches/15_disable_qlogic_firmware.patch deleted file mode 100644 index ba2bc28..0000000 --- a/debian/patches/15_disable_qlogic_firmware.patch +++ /dev/null @@ -1,44 +0,0 @@ -#DPATCHLEVEL=1 - -2004-10-27 Guillem Jover <guillem@hadrons.org> - - * linux/src/drivers/scsi/qlogicisp_asm.c: Remove file with binary - only firmware. - * linux/src/drivers/scsi/qlogicisp.c: Do not include "qlogicisp_asm.c". - (RELOAD_FIRMWARE): Set to 0. - (risc_code_addr01): New variable from qlogicisp_asm.c. - * linux/Files: Remove linux/src/drivers/scsi/qlogicisp_asm.c. - - -diff -Naur -x CVS gnumach.orig/linux/Files gnumach/linux/Files ---- gnumach.orig/linux/Files 2002-05-23 02:06:26.000000000 +0200 -+++ gnumach/linux/Files 2004-10-27 06:04:12.000000000 +0200 -@@ -198,7 +198,6 @@ - linux/src/drivers/scsi/ppa.h - linux/src/drivers/scsi/qlogicfas.c - linux/src/drivers/scsi/qlogicfas.h --linux/src/drivers/scsi/qlogicisp_asm.c - linux/src/drivers/scsi/qlogicisp.c - linux/src/drivers/scsi/qlogicisp.h - linux/src/drivers/scsi/scripts.h -diff -Naur -x CVS gnumach.orig/linux/src/drivers/scsi/qlogicisp.c gnumach/linux/src/drivers/scsi/qlogicisp.c ---- gnumach.orig/linux/src/drivers/scsi/qlogicisp.c 2004-10-27 03:06:03.000000000 +0200 -+++ gnumach/linux/src/drivers/scsi/qlogicisp.c 2004-10-27 06:04:45.000000000 +0200 -@@ -105,7 +105,7 @@ - the latest firmware provided by QLogic. This may be an earlier/later - revision than supplied by your board. */ - --#define RELOAD_FIRMWARE 1 -+#define RELOAD_FIRMWARE 0 - - /* Set the following macro to 1 to reload the ISP1020's defaults from nvram. - If you are not sure of your settings, leave this alone, the driver will -@@ -433,7 +433,7 @@ - #define MBOX_WRITE_FOUR_RAM_WORDS 0x0041 - #define MBOX_EXEC_BIOS_IOCB 0x0042 - --#include "qlogicisp_asm.c" -+unsigned short risc_code_addr01 = 0x1000 ; - - #define PACKB(a, b) (((a)<<4)|(b)) - diff --git a/debian/patches/16_enable_debug.patch b/debian/patches/16_enable_debug.patch deleted file mode 100644 index d7938d0..0000000 --- a/debian/patches/16_enable_debug.patch +++ /dev/null @@ -1,130 +0,0 @@ -#DPATCHLEVEL=0 - -2004-11-22 Guillem Jover <guillem@hadrons.org> - - * bogus/mach_assert.h: Change #ifdef DEBUG to #ifndef NDEBUG - for assert et al. - * kern/assert.h: Likewise. - * kern/debug.h: Likewise. - * util/debug.h: Likewise. - - * i386/i386/debug.h: Move dump_ss definition out of [DEBUG]. - * linux/dev/glue/block.c (rdwr_full): Remove invalid assert. - - -diff -Naur bogus/mach_assert.h bogus/mach_assert.h ---- bogus/mach_assert.h 1997-02-25 22:28:02.000000000 +0100 -+++ bogus/mach_assert.h 2004-11-22 02:27:51.000000000 +0100 -@@ -1,4 +1,4 @@ --#ifdef DEBUG -+#ifndef NDEBUG - #define MACH_ASSERT 1 - #else - #define MACH_ASSERT 0 -diff -Naur i386/i386/debug.h i386/i386/debug.h ---- i386/i386/debug.h 2001-04-05 08:39:20.000000000 +0200 -+++ i386/i386/debug.h 2004-11-22 02:56:11.000000000 +0100 -@@ -23,6 +23,10 @@ - #ifndef _I386_DEBUG_ - #define _I386_DEBUG_ - -+/* Dump a saved state. -+ Probably a good idea to have this around -+ even when DEBUG isn't turned on. */ -+void dump_ss(struct i386_saved_state *st); - - #ifdef DEBUG - -@@ -37,11 +41,6 @@ - and all registers are saved. */ - #ifndef ASSEMBLER - --/* Dump a saved state. -- Probably a good idea to have this around -- even when DEBUG isn't turned on. */ --void dump_ss(struct i386_saved_state *st); -- - #define DEBUG_TRACE _debug_trace(__FILE__,__LINE__) - - /* Reset the debug trace buffer so it contains no valid entries. */ -diff -Naur kern/assert.h kern/assert.h ---- kern/assert.h 2001-04-05 08:39:20.000000000 +0200 -+++ kern/assert.h 2004-11-22 02:35:08.000000000 +0100 -@@ -31,7 +31,7 @@ - - #include <kern/macro_help.h> - --#ifdef DEBUG -+#ifndef NDEBUG - #define MACH_ASSERT 1 - #endif - -diff -Naur kern/debug.h kern/debug.h ---- kern/debug.h 2001-04-05 08:39:20.000000000 +0200 -+++ kern/debug.h 2004-11-22 02:37:00.000000000 +0100 -@@ -30,7 +30,7 @@ - - #include <kern/assert.h> /*XXX*/ - --#ifdef DEBUG -+#ifndef NDEBUG - - #define here() printf("@ %s:%d\n", __FILE__, __LINE__) - #define message(args) ({ printf("@ %s:%d: ", __FILE__, __LINE__); printf args; printf("\n"); }) -@@ -46,7 +46,7 @@ - __FILE__, __LINE__, (p), (id), (p->struct_id)); \ - }) - --#else /* !DEBUG */ -+#else /* NDEBUG */ - - #define otsan() - -@@ -55,6 +55,6 @@ - #define struct_id_denit(p) - #define struct_id_verify(p,id) - --#endif /* !DEBUG */ -+#endif /* NDEBUG */ - - #endif /* _mach_debug__debug_ */ -diff -Naur util/debug.h util/debug.h ---- util/debug.h 1997-02-25 22:28:35.000000000 +0100 -+++ util/debug.h 2004-11-22 02:33:56.000000000 +0100 -@@ -34,7 +34,7 @@ - #include <mach/macro_help.h> - - --#ifdef DEBUG -+#ifndef NDEBUG - - extern void panic(const char *fmt, ...); - -@@ -64,7 +64,7 @@ - __FILE__, __LINE__, (p), (id), (p->struct_id)); \ - }) - --#else !DEBUG -+#else /* NDEBUG */ - - #define otsan() - #define assert(v) -@@ -76,6 +76,6 @@ - #define struct_id_denit(p) - #define struct_id_verify(p,id) - --#endif !DEBUG -+#endif /* NDEBUG */ - - #endif _MACH_UTIL_DEBUG_H_ -diff -Naur linux/dev/glue/block.c linux/dev/glue/block.c ---- linux/dev/glue/block.c 2004-01-19 02:44:31.000000000 +0100 -+++ linux/dev/glue/block.c 2004-11-22 03:26:58.000000000 +0100 -@@ -595,7 +595,6 @@ - struct buffer_head bhead[MAX_BUF], *bh, *bhp[MAX_BUF]; - - assert ((*off & BMASK) == 0); -- assert (*resid >= bsize); - - nbuf = *resid >> bshift; - blk = *off >> bshift; diff --git a/debian/patches/17_fix_double_free.patch b/debian/patches/17_fix_double_free.patch deleted file mode 100644 index 8969b91..0000000 --- a/debian/patches/17_fix_double_free.patch +++ /dev/null @@ -1,122 +0,0 @@ -#DPATCHLEVEL=0 - -2004-09-07 Neal H. Walfield <neal@cs.uml.edu> - - * linux/dev/glue/block.c (__brelse): Unconditionally kfree BH. - (getblk): Unconditionally kalloc BH. - - * kern/kalloc.c [!NDEBUG] (kalloc_init_called): New static - variable. - (kalloc_init): Assert that kalloc_init_called is zero. - [! NDEBUG] Set kalloc_init_called to 1 on success. - (kalloc): Assert that kalloc_init_called is non-zero. - (kget): Likewise. - (kfree): Likewise. - - -Index: linux/dev/glue/block.c -=================================================================== -RCS file: /cvsroot/hurd/gnumach/linux/dev/glue/Attic/block.c,v -retrieving revision 1.8.2.2 -diff -u -p -r1.8.2.2 block.c ---- linux/dev/glue/block.c 19 Jan 2004 01:44:31 -0000 1.8.2.2 -+++ linux/dev/glue/block.c 7 Sep 2004 15:08:17 -0000 -@@ -354,22 +354,17 @@ struct buffer_head * - getblk (kdev_t dev, int block, int size) - { - struct buffer_head *bh; -- static struct buffer_head bhead; - - assert (size <= PAGE_SIZE); - -- if (! linux_auto_config) -- bh = (struct buffer_head *) kalloc (sizeof (struct buffer_head)); -- else -- bh = &bhead; -+ bh = (struct buffer_head *) kalloc (sizeof (struct buffer_head)); - if (bh) - { - memset (bh, 0, sizeof (struct buffer_head)); - bh->b_data = alloc_buffer (size); - if (! bh->b_data) - { -- if (! linux_auto_config) -- kfree ((vm_offset_t) bh, sizeof (struct buffer_head)); -+ kfree ((vm_offset_t) bh, sizeof (struct buffer_head)); - return NULL; - } - bh->b_dev = dev; -@@ -385,8 +380,7 @@ void - __brelse (struct buffer_head *bh) - { - free_buffer (bh->b_data, bh->b_size); -- if (! linux_auto_config) -- kfree ((vm_offset_t) bh, sizeof (*bh)); -+ kfree ((vm_offset_t) bh, sizeof (*bh)); - } - - /* Allocate a buffer of SIZE bytes and fill it with data -Index: kern/kalloc.c -=================================================================== -RCS file: /cvsroot/hurd/gnumach/kern/kalloc.c,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 kalloc.c ---- kern/kalloc.c 25 Feb 1997 21:28:23 -0000 1.1.1.1 -+++ kern/kalloc.c 7 Sep 2004 15:08:17 -0000 -@@ -106,12 +106,18 @@ unsigned long k_zone_max[16] = { - * This initializes all of the zones. - */ - -+#ifndef NDEBUG -+static int kalloc_init_called; -+#endif -+ - void kalloc_init() - { - vm_offset_t min, max; - vm_size_t size; - register int i; - -+ assert (! kalloc_init_called); -+ - kalloc_map = kmem_suballoc(kernel_map, &min, &max, - kalloc_map_size, FALSE); - -@@ -142,6 +148,10 @@ void kalloc_init() - size >= PAGE_SIZE ? ZONE_COLLECTABLE : 0, - k_zone_name[i]); - } -+ -+#ifndef NDEBUG -+ kalloc_init_called = 1; -+#endif - } - - vm_offset_t kalloc(size) -@@ -153,6 +163,8 @@ vm_offset_t kalloc(size) - - /* compute the size of the block that we will actually allocate */ - -+ assert (kalloc_init_called); -+ - allocsize = size; - if (size < kalloc_max) { - allocsize = MINSIZE; -@@ -185,6 +197,8 @@ vm_offset_t kget(size) - register vm_size_t allocsize; - vm_offset_t addr; - -+ assert (kalloc_init_called); -+ - /* compute the size of the block that we will actually allocate */ - - allocsize = size; -@@ -219,6 +233,8 @@ kfree(data, size) - register int zindex; - register vm_size_t freesize; - -+ assert (kalloc_init_called); -+ - freesize = size; - if (size < kalloc_max) { - freesize = MINSIZE; diff --git a/debian/patches/18_linux_printk_buffer_overrun.patch b/debian/patches/18_linux_printk_buffer_overrun.patch deleted file mode 100644 index 75bb7ba..0000000 --- a/debian/patches/18_linux_printk_buffer_overrun.patch +++ /dev/null @@ -1,87 +0,0 @@ -#DPATCHLEVEL=0 - -2004-09-08 Neal H. Walfield <neal@cs.uml.edu> - - * linux/dev/kernel/printk.c: Include <kern/assert.h>. - (printk): Use vsnprintf, not linux_vsprintf to avoid buffer - overruns. - - * kern/printf.c (struct vsnprintf_cookie): New structure. - (snputc): New function. - (vsnprintf): Likewise. - - -Index: linux/dev/kernel/printk.c -=================================================================== -RCS file: /cvsroot/hurd/gnumach/linux/dev/kernel/Attic/printk.c,v -retrieving revision 1.1 -diff -u -p -r1.1 printk.c ---- linux/dev/kernel/printk.c 26 Apr 1999 05:49:36 -0000 1.1 -+++ linux/dev/kernel/printk.c 8 Sep 2004 10:29:05 -0000 -@@ -26,6 +26,7 @@ - #define MACH_INCLUDE - #include <stdarg.h> - #include <asm/system.h> -+#include <kern/assert.h> - - static char buf[2048]; - -@@ -40,14 +41,14 @@ printk (char *fmt, ...) - va_list args; - int n, flags; - extern void cnputc (); -- extern int linux_vsprintf (char *buf, char *fmt,...); - char *p, *msg, *buf_end; - static int msg_level = -1; - - save_flags (flags); - cli (); - va_start (args, fmt); -- n = linux_vsprintf (buf + 3, fmt, args); -+ n = vsnprintf (buf + 3, sizeof (buf) - 3, fmt, args); -+ assert (n <= sizeof (buf) - 3); - buf_end = buf + 3 + n; - va_end (args); - for (p = buf + 3; p < buf_end; p++) -Index: kern/printf.c -=================================================================== -RCS file: /cvsroot/hurd/gnumach/kern/Attic/printf.c,v -retrieving revision 1.2 -diff -u -p -r1.2 printf.c ---- kern/printf.c 23 Jul 2000 00:34:12 -0000 1.2 -+++ kern/printf.c 8 Sep 2004 10:29:06 -0000 -@@ -579,6 +579,34 @@ sprintf(char *buf, const char *fmt, ...) - return (buf - start); - } - -+struct vsnprintf_cookie -+{ -+ char *buf; -+ int index; -+ int max_len; -+}; -+ -+static void -+snputc(char c, vm_offset_t arg) -+{ -+ struct vsnprintf_cookie *cookie = (void *) arg; -+ -+ if (cookie->index < cookie->max_len) -+ cookie->buf[cookie->index ++] = c; -+} -+ -+int -+vsnprintf(char *buf, int size, const char *fmt, va_list args) -+{ -+ struct vsnprintf_cookie cookie -+ = { .buf = buf, .index = 0, .max_len = size }; -+ -+ _doprnt (fmt, &args, snputc, 16, (vm_offset_t)&cookie); -+ cookie.buf[cookie.index] = '\0'; -+ -+ return cookie.index; -+} -+ - - void safe_gets(str, maxlen) - char *str; diff --git a/debian/patches/19_cpu_detect.patch b/debian/patches/19_cpu_detect.patch deleted file mode 100644 index 5eb27d5..0000000 --- a/debian/patches/19_cpu_detect.patch +++ /dev/null @@ -1,93 +0,0 @@ -#DPATCHLEVEL=0 - -2004-11-22 Guillem Jover <guillem@hadrons.org> - - * i386/i386/locore.S (discover_x86_cpu_type): Enable function. - Enable ID flag for Cyrix CPU. Use %ebp to save the stack pointer. - Restore EFLAGS just after its last usage. - * i386/i386at/model_dep.c (c_boot_entry): Enable use of - discover_x86_cpu_type. Remove hardcoded cpu_type assignment. - * i386/include/mach/i386/eflags.h - (EFL_AC, EFL_VI, EFL_VIP, EFL_ID): New bits. - - -diff -Naur i386/i386/locore.S i386/i386/locore.S ---- i386/i386/locore.S 2001-10-07 21:47:15.000000000 +0200 -+++ i386/i386/locore.S 2004-11-21 21:40:21.000000000 +0100 -@@ -1144,13 +1144,16 @@ - jmp _take_trap /* treat as a trap */ - - --#if 0 - /* Discover what kind of cpu we have; return the family number - (3, 4, 5, 6, for 386, 486, 586, 686 respectively). */ - ENTRY(discover_x86_cpu_type) -- movl %esp,%edx /* Save stack pointer */ -+ pushl %ebp /* Save frame pointer */ -+ movl %esp,%ebp /* Save stack pointer */ - and $~0x3,%esp /* Align stack pointer */ - -+ inb $0xe8,%al /* Enable ID flag for Cyrix CPU ... */ -+ andb $0x80,%al /* ... in CCR4 reg bit7 */ -+ outb %al,$0xe8 - pushfl /* Fetch flags ... */ - popl %eax /* ... into eax */ - movl %eax,%ecx /* Save original flags for return */ -@@ -1159,6 +1162,8 @@ - popfl /* ... In EFLAGS */ - pushfl /* Fetch flags back ... */ - popl %eax /* ... into eax */ -+ pushl %ecx /* From ecx... */ -+ popfl /* ... restore original flags */ - - xorl %ecx,%eax /* See if any bits didn't change */ - testl $EFL_AC,%eax /* Test AC bit */ -@@ -1178,11 +1183,9 @@ - shrl $8,%eax /* Slide family bits down */ - andl $15,%eax /* And select them */ - --9: pushl %ecx /* From ecx... */ -- popfl /* ... restore original flags */ -- movl %edx,%esp /* Restore stack pointer */ -+9: movl %ebp,%esp /* Restore stack pointer */ -+ popl %ebp /* Restore frame pointer */ - ret /* And return */ --#endif - - - /* */ -diff -Naur i386/i386at/model_dep.c i386/i386at/model_dep.c ---- i386/i386at/model_dep.c 2002-05-23 03:54:57.000000000 +0200 -+++ i386/i386at/model_dep.c 2004-11-21 21:41:09.000000000 +0100 -@@ -372,7 +372,6 @@ - machine_slot[0].running = TRUE; - machine_slot[0].cpu_subtype = CPU_SUBTYPE_AT386; - --#if 0 - switch (discover_x86_cpu_type ()) - { - case 3: -@@ -389,10 +388,6 @@ - machine_slot[0].cpu_type = CPU_TYPE_PENTIUMPRO; - break; - } --#else -- machine_slot[0].cpu_type = CPU_TYPE_I386; --#endif -- - - /* - * Start the system. -diff -Naur i386/include/mach/i386/eflags.h i386/include/mach/i386/eflags.h ---- i386/include/mach/i386/eflags.h 2001-04-05 08:39:21.000000000 +0200 -+++ i386/include/mach/i386/eflags.h 2004-11-21 21:39:13.000000000 +0100 -@@ -45,5 +45,9 @@ - #define EFL_NT 0x00004000 /* nested task */ - #define EFL_RF 0x00010000 /* resume without tracing */ - #define EFL_VM 0x00020000 /* virtual 8086 mode */ -+#define EFL_AC 0x00040000 /* alignment check */ -+#define EFL_VI 0x00080000 /* virtual interrupt */ -+#define EFL_VIP 0x00100000 /* virtual interrupt pending */ -+#define EFL_ID 0x00200000 /* cpuid available */ - - #endif /* _MACH_I386_EFLAGS_H_ */ diff --git a/debian/patches/20_glue_block_assert.patch b/debian/patches/20_glue_block_assert.patch deleted file mode 100644 index bd99113..0000000 --- a/debian/patches/20_glue_block_assert.patch +++ /dev/null @@ -1,21 +0,0 @@ -#DPATCHLEVEL=1 - -2005-02-10 Guillem Jover <guillem@hadrons.org> - - * linux/dev/glue/block.c (rdwr_partial): Remove leftover assert. - -The error can be reproduced by "fdisk /dev/hf0". Giving: - - linux/dev/glue/block.c 547 (rdwr_partial): assert(*resid <= c); - -diff -Naur gnumach-20040915.orig/linux/dev/glue/block.c gnumach-20040915/linux/dev/glue/block.c ---- gnumach-20040915.orig/linux/dev/glue/block.c 2005-02-10 05:40:34.000000000 +0100 -+++ gnumach-20040915/linux/dev/glue/block.c 2005-02-10 05:59:14.000000000 +0100 -@@ -544,7 +544,6 @@ rdwr_partial (int rw, kdev_t dev, loff_t - { - o = *off & BMASK; - c = bh->b_size - o; -- assert (*resid <= c); - if (c > *resid) - c = *resid; - if (rw == READ) diff --git a/debian/patches/90_autoconf_autogen.patch b/debian/patches/90_autoconf_autogen.patch index 19e6984..f75f439 100644 --- a/debian/patches/90_autoconf_autogen.patch +++ b/debian/patches/90_autoconf_autogen.patch @@ -7,9 +7,9 @@ Regenerate with: find -name autom4te.cache | xargs rm -rf -diff -Naur gnumach-20040915.orig/configure gnumach-20040915/configure ---- gnumach-20040915.orig/configure 2002-05-23 02:06:35.000000000 +0200 -+++ gnumach-20040915/configure 2004-10-25 06:48:10.000000000 +0200 +diff -Naur gnumach-20050501.orig/configure gnumach-20050501/configure +--- gnumach-20050501.orig/configure 2002-05-23 03:06:35.000000000 +0300 ++++ gnumach-20050501/configure 2005-05-01 19:24:47.205773072 +0300 @@ -1,31 +1,293 @@ #! /bin/sh - @@ -4787,9 +4787,9 @@ diff -Naur gnumach-20040915.orig/configure gnumach-20040915/configure done fi -diff -Naur gnumach-20040915.orig/i386/configure gnumach-20040915/i386/configure ---- gnumach-20040915.orig/i386/configure 1999-05-01 02:34:06.000000000 +0200 -+++ gnumach-20040915/i386/configure 2004-10-25 06:48:09.000000000 +0200 +diff -Naur gnumach-20050501.orig/i386/configure gnumach-20050501/i386/configure +--- gnumach-20050501.orig/i386/configure 1999-05-01 03:34:06.000000000 +0300 ++++ gnumach-20050501/i386/configure 2005-05-01 19:24:46.419892544 +0300 @@ -1,28 +1,289 @@ #! /bin/sh - @@ -7853,9 +7853,9 @@ diff -Naur gnumach-20040915.orig/i386/configure gnumach-20040915/i386/configure done fi -diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linux/configure ---- gnumach-20040915.orig/i386/linux/configure 2001-05-27 14:44:22.000000000 +0200 -+++ gnumach-20040915/i386/linux/configure 2004-10-25 06:48:07.000000000 +0200 +diff -Naur gnumach-20050501.orig/i386/linux/configure gnumach-20050501/i386/linux/configure +--- gnumach-20050501.orig/i386/linux/configure 2001-05-27 15:44:22.000000000 +0300 ++++ gnumach-20050501/i386/linux/configure 2005-05-01 19:24:44.516181952 +0300 @@ -1,392 +1,288 @@ #! /bin/sh - @@ -8088,13 +8088,13 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - --# Defaults: --ac_help= ++ +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + -+ + +-# Defaults: +-ac_help= +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' @@ -9075,7 +9075,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. -@@ -835,13 +690,654 @@ +@@ -835,13 +690,656 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then @@ -9197,127 +9197,127 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --enable-3c501 enable driver alias 3c501 -+ --enable-3c503 enable driver alias 3c503 -+ --enable-3c509 enable driver alias 3c509 -+ --enable-3c579 enable driver alias 3c579 -+ --enable-3c59x enable driver alias 3c59x -+ --enable-3c90x enable driver alias 3c90x -+ --enable-hpj2577 enable driver alias hpj2577 -+ --enable-hpj2573 enable driver alias hpj2573 -+ --enable-hpj2585 enable driver alias hpj2585 -+ --enable-hp27248b enable driver alias hp27248b -+ --enable-eth32 enable driver alias eth32 -+ --enable-znote enable driver alias znote -+ --enable-de100 enable driver alias de100 -+ --enable-de101 enable driver alias de101 -+ --enable-de200 enable driver alias de200 -+ --enable-de201 enable driver alias de201 -+ --enable-de202 enable driver alias de202 -+ --enable-de210 enable driver alias de210 -+ --enable-de422 enable driver alias de422 -+ --enable-de203 enable driver alias de203 -+ --enable-de204 enable driver alias de204 -+ --enable-de205 enable driver alias de205 -+ --enable-de425 enable driver alias de425 -+ --enable-de434 enable driver alias de434 -+ --enable-de435 enable driver alias de435 -+ --enable-de450 enable driver alias de450 -+ --enable-de500 enable driver alias de500 -+ --enable-3c507 enable driver alias 3c507 -+ --enable-3c505 enable driver alias 3c505 -+ --enable-ne1000 enable driver alias ne1000 -+ --enable-ne enable driver alias ne -+ --enable-at1500 enable driver alias at1500 -+ --enable-ne2100 enable driver alias ne2100 -+ --enable-tulip enable driver alias tulip -+ --enable-rtl8129 enable driver alias rtl8129 -+ --enable-aha2825 enable driver alias aha2825 -+ --enable-ncr53c400 enable driver alias ncr53c400 -+ --enable-t128f enable driver alias t128f -+ --enable-t228 enable driver alias t228 -+ --enable-am79c974 enable driver alias am79c974 -+ --enable-dtc3180 enable driver alias dtc3180 -+ --enable-dc390w enable driver alias dc390w -+ --enable-dc390u enable driver alias dc390u -+ --enable-dc390f enable driver alias dc390f -+ --enable-dc390 enable driver alias dc390 -+ --enable-epic100 enable driver alias epic100 ++ --enable-3c501 enable driver alias 3c501 for el1 ++ --enable-3c503 enable driver alias 3c503 for el2 ++ --enable-3c509 enable driver alias 3c509 for el3 ++ --enable-3c579 enable driver alias 3c579 for el3 ++ --enable-3c59x enable driver alias 3c59x for vortex ++ --enable-3c90x enable driver alias 3c90x for vortex ++ --enable-hpj2577 enable driver alias hpj2577 for hp100 ++ --enable-hpj2573 enable driver alias hpj2573 for hp100 ++ --enable-hpj2585 enable driver alias hpj2585 for hp100 ++ --enable-hp27248b enable driver alias hp27248b for hp100 ++ --enable-eth32 enable driver alias eth32 for eth16i ++ --enable-znote enable driver alias znote for znet ++ --enable-de100 enable driver alias de100 for depca ++ --enable-de101 enable driver alias de101 for depca ++ --enable-de200 enable driver alias de200 for depca ++ --enable-de201 enable driver alias de201 for depca ++ --enable-de202 enable driver alias de202 for depca ++ --enable-de210 enable driver alias de210 for depca ++ --enable-de422 enable driver alias de422 for depca ++ --enable-de203 enable driver alias de203 for ewrk3 ++ --enable-de204 enable driver alias de204 for ewrk3 ++ --enable-de205 enable driver alias de205 for ewrk3 ++ --enable-de425 enable driver alias de425 for de4x5 ++ --enable-de434 enable driver alias de434 for de4x5 ++ --enable-de435 enable driver alias de435 for de4x5 ++ --enable-de450 enable driver alias de450 for de4x5 ++ --enable-de500 enable driver alias de500 for de4x5 ++ --enable-3c507 enable driver alias 3c507 for el16 ++ --enable-3c505 enable driver alias 3c505 for elplus ++ --enable-ne1000 enable driver alias ne1000 for ne2000 ++ --enable-ne enable driver alias ne for ne2000 ++ --enable-at1500 enable driver alias at1500 for lance ++ --enable-ne2100 enable driver alias ne2100 for lance ++ --enable-tulip enable driver alias tulip for elcp ++ --enable-rtl8129 enable driver alias rtl8129 for rtl8139 ++ --enable-aha2825 enable driver alias aha2825 for aha152x ++ --enable-ncr53c400 enable driver alias ncr53c400 for ncr5380 ++ --enable-t128f enable driver alias t128f for t128 ++ --enable-t228 enable driver alias t228 for t128 ++ --enable-am79c974 enable driver alias am79c974 for am53c974 ++ --enable-dtc3180 enable driver alias dtc3180 for dtc3280 ++ --enable-dc390w enable driver alias dc390w for ncr53c8xx ++ --enable-dc390u enable driver alias dc390u for ncr53c8xx ++ --enable-dc390f enable driver alias dc390f for ncr53c8xx ++ --enable-dc390 enable driver alias dc390 for dc390t ++ --enable-epic100 enable driver alias epic100 for epic + --enable-floppy enable driver floppy + --enable-ide enable driver ide + --enable-ide-forcedma enable forced use of DMA on IDE -+ --enable-advansys enable driver alias advansys ++ --enable-advansys enable driver alias advansys for advansys + --enable-advansys enable driver advansys -+ --enable-BusLogic enable driver alias BusLogic ++ --enable-BusLogic enable driver alias BusLogic for buslogic + --enable-buslogic enable driver buslogic -+ --enable-u14-34f enable driver alias u14-34f ++ --enable-u14-34f enable driver alias u14-34f for u1434f + --enable-u1434f enable driver u1434f -+ --enable-ultrastor enable driver alias ultrastor ++ --enable-ultrastor enable driver alias ultrastor for ultrastor + --enable-ultrastor enable driver ultrastor -+ --enable-aha152x enable driver alias aha152x ++ --enable-aha152x enable driver alias aha152x for aha152x + --enable-aha152x enable driver aha152x -+ --enable-aha1542 enable driver alias aha1542 ++ --enable-aha1542 enable driver alias aha1542 for aha1542 + --enable-aha1542 enable driver aha1542 -+ --enable-aha1740 enable driver alias aha1740 ++ --enable-aha1740 enable driver alias aha1740 for aha1740 + --enable-aha1740 enable driver aha1740 -+ --enable-aic7xxx enable driver alias aic7xxx ++ --enable-aic7xxx enable driver alias aic7xxx for aic7xxx + --enable-aic7xxx enable driver aic7xxx -+ --enable-fdomain enable driver alias fdomain ++ --enable-fdomain enable driver alias fdomain for futuredomain + --enable-futuredomain enable driver futuredomain -+ --enable-in2000 enable driver alias in2000 ++ --enable-in2000 enable driver alias in2000 for in2000 + --enable-in2000 enable driver in2000 -+ --enable-g_NCR5380 enable driver alias g_NCR5380 ++ --enable-g_NCR5380 enable driver alias g_NCR5380 for ncr5380 + --enable-ncr5380 enable driver ncr5380 -+ --enable-NCR53c406a enable driver alias NCR53c406a ++ --enable-NCR53c406a enable driver alias NCR53c406a for ncr53c406a + --enable-ncr53c406a enable driver ncr53c406a -+ --enable-pas16 enable driver alias pas16 ++ --enable-pas16 enable driver alias pas16 for pas16 + --enable-pas16 enable driver pas16 -+ --enable-seagate enable driver alias seagate ++ --enable-seagate enable driver alias seagate for seagate + --enable-seagate enable driver seagate -+ --enable-t128 enable driver alias t128 ++ --enable-t128 enable driver alias t128 for t128 + --enable-t128 enable driver t128 -+ --enable-53c78xx enable driver alias 53c78xx ++ --enable-53c78xx enable driver alias 53c78xx for ncr53c7xx + --enable-ncr53c7xx enable driver ncr53c7xx -+ --enable-eata_dma enable driver alias eata_dma ++ --enable-eata_dma enable driver alias eata_dma for eatadma + --enable-eatadma enable driver eatadma -+ --enable-eata_pio enable driver alias eata_pio ++ --enable-eata_pio enable driver alias eata_pio for eatapio + --enable-eatapio enable driver eatapio -+ --enable-wd7000 enable driver alias wd7000 ++ --enable-wd7000 enable driver alias wd7000 for wd7000 + --enable-wd7000 enable driver wd7000 -+ --enable-eata enable driver alias eata ++ --enable-eata enable driver alias eata for eata + --enable-eata enable driver eata -+ --enable-AM53C974 enable driver alias AM53C974 ++ --enable-AM53C974 enable driver alias AM53C974 for am53c974 + --enable-am53c974 enable driver am53c974 -+ --enable-dtc enable driver alias dtc ++ --enable-dtc enable driver alias dtc for dtc3280 + --enable-dtc3280 enable driver dtc3280 -+ --enable-ncr53c8xx enable driver alias ncr53c8xx ++ --enable-ncr53c8xx enable driver alias ncr53c8xx for ncr53c8xx + --enable-ncr53c8xx enable driver ncr53c8xx -+ --enable-tmscsim enable driver alias tmscsim ++ --enable-tmscsim enable driver alias tmscsim for dc390t + --enable-dc390t enable driver dc390t -+ --enable-ppa enable driver alias ppa ++ --enable-ppa enable driver alias ppa for ppa + --enable-ppa enable driver ppa -+ --enable-qlogicfas enable driver alias qlogicfas ++ --enable-qlogicfas enable driver alias qlogicfas for qlogicfas + --enable-qlogicfas enable driver qlogicfas -+ --enable-qlogicisp enable driver alias qlogicisp ++ --enable-qlogicisp enable driver alias qlogicisp for qlogicisp + --enable-qlogicisp enable driver qlogicisp -+ --enable-gdth enable driver alias gdth ++ --enable-gdth enable driver alias gdth for gdth + --enable-gdth enable driver gdth + --enable-flashpoint enable SCSI flashpoint [default=no] -+ --enable-starfire enable driver alias starfire ++ --enable-starfire enable driver alias starfire for starfire + --enable-starfire enable driver starfire -+ --enable-sundance enable driver alias sundance ++ --enable-sundance enable driver alias sundance for sundance + --enable-sundance enable driver sundance -+ --enable-winbond-840 enable driver alias winbond-840 ++ --enable-winbond-840 enable driver alias winbond-840 for winbond_840 + --enable-winbond_840 enable driver winbond_840 -+ --enable-hamachi enable driver alias hamachi ++ --enable-hamachi enable driver alias hamachi for hamachi + --enable-hamachi enable driver hamachi -+ --enable-intel-gige enable driver alias intel-gige ++ --enable-intel-gige enable driver alias intel-gige for intel_gige + --enable-intel_gige enable driver intel_gige -+ --enable-natsemi enable driver alias natsemi ++ --enable-natsemi enable driver alias natsemi for natsemi + --enable-natsemi enable driver natsemi -+ --enable-myson803 enable driver alias myson803 ++ --enable-myson803 enable driver alias myson803 for myson803 + --enable-myson803 enable driver myson803 -+ --enable-ns820 enable driver alias ns820 ++ --enable-ns820 enable driver alias ns820 for ns820 + --enable-ns820 enable driver ns820 + --enable-ne2000 enable driver ne2000 + --enable-el2 enable driver el2 @@ -9329,66 +9329,68 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + --enable-hplanplus enable driver hplanplus + --enable-hplan enable driver hplan + --enable-vortex enable driver vortex -+ --enable-seeq8005 enable driver alias seeq8005 ++ --enable-seeq8005 enable driver alias seeq8005 for seeq8005 + --enable-seeq8005 enable driver seeq8005 -+ --enable-hp100 enable driver alias hp100 ++ --enable-hp100 enable driver alias hp100 for hp100 + --enable-hp100 enable driver hp100 + --enable-ac3200 enable driver ac3200 + --enable-e2100 enable driver e2100 -+ --enable-at1700 enable driver alias at1700 ++ --enable-at1700 enable driver alias at1700 for at1700 + --enable-at1700 enable driver at1700 -+ --enable-eth16i enable driver alias eth16i ++ --enable-eth16i enable driver alias eth16i for eth16i + --enable-eth16i enable driver eth16i -+ --enable-znet enable driver alias znet ++ --enable-znet enable driver alias znet for znet + --enable-znet enable driver znet -+ --enable-eexpress enable driver alias eexpress ++ --enable-eexpress enable driver alias eexpress for eexpress + --enable-eexpress enable driver eexpress -+ --enable-eepro enable driver alias eepro ++ --enable-eepro enable driver alias eepro for eexpresspro + --enable-eexpresspro enable driver eexpresspro -+ --enable-eepro100 enable driver alias eepro100 ++ --enable-eepro100 enable driver alias eepro100 for eexpresspro100 + --enable-eexpresspro100 enable driver eexpresspro100 -+ --enable-depca enable driver alias depca ++ --enable-depca enable driver alias depca for depca + --enable-depca enable driver depca -+ --enable-ewrk3 enable driver alias ewrk3 ++ --enable-ewrk3 enable driver alias ewrk3 for ewrk3 + --enable-ewrk3 enable driver ewrk3 -+ --enable-de4x5 enable driver alias de4x5 ++ --enable-de4x5 enable driver alias de4x5 for de4x5 + --enable-de4x5 enable driver de4x5 -+ --enable-apricot enable driver alias apricot ++ --enable-apricot enable driver alias apricot for apricot + --enable-apricot enable driver apricot -+ --enable-wavelan enable driver alias wavelan ++ --enable-wavelan enable driver alias wavelan for wavelan + --enable-wavelan enable driver wavelan + --enable-el16 enable driver el16 + --enable-elplus enable driver elplus -+ --enable-de600 enable driver alias de600 ++ --enable-de600 enable driver alias de600 for de600 + --enable-de600 enable driver de600 -+ --enable-de620 enable driver alias de620 ++ --enable-de620 enable driver alias de620 for de620 + --enable-de620 enable driver de620 -+ --enable-sk_g16 enable driver alias sk_g16 ++ --enable-sis900 enable driver alias sis900 for sis900 ++ --enable-sis900 enable driver sis900 ++ --enable-sk_g16 enable driver alias sk_g16 for skg16 + --enable-skg16 enable driver skg16 -+ --enable-ni52 enable driver alias ni52 ++ --enable-ni52 enable driver alias ni52 for ni52 + --enable-ni52 enable driver ni52 -+ --enable-ni65 enable driver alias ni65 ++ --enable-ni65 enable driver alias ni65 for ni65 + --enable-ni65 enable driver ni65 -+ --enable-atp enable driver alias atp ++ --enable-atp enable driver alias atp for atp + --enable-atp enable driver atp -+ --enable-lance enable driver alias lance ++ --enable-lance enable driver alias lance for lance + --enable-lance enable driver lance + --enable-elcp enable driver elcp -+ --enable-fmv18x enable driver alias fmv18x ++ --enable-fmv18x enable driver alias fmv18x for fmv18x + --enable-fmv18x enable driver fmv18x -+ --enable-3c515 enable driver alias 3c515 ++ --enable-3c515 enable driver alias 3c515 for 3c515 + --enable-3c515 enable driver 3c515 -+ --enable-pcnet32 enable driver alias pcnet32 ++ --enable-pcnet32 enable driver alias pcnet32 for pcnet32 + --enable-pcnet32 enable driver pcnet32 + --enable-ne2kpci enable driver ne2kpci -+ --enable-yellowfin enable driver alias yellowfin ++ --enable-yellowfin enable driver alias yellowfin for yellowfin + --enable-yellowfin enable driver yellowfin -+ --enable-rtl8139 enable driver alias rtl8139 ++ --enable-rtl8139 enable driver alias rtl8139 for rtl8139 + --enable-rtl8139 enable driver rtl8139 + --enable-epic enable driver epic -+ --enable-tlan enable driver alias tlan ++ --enable-tlan enable driver alias tlan for tlan + --enable-tlan enable driver tlan -+ --enable-via-rhine enable driver alias via-rhine ++ --enable-via-rhine enable driver alias via-rhine for viarhine + --enable-viarhine enable driver viarhine + +Some influential environment variables: @@ -9551,7 +9553,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +done + +} >&5 -+ + +cat >&5 <<_ACEOF + + @@ -9712,7 +9714,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF - ++ + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" @@ -9733,7 +9735,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then -@@ -852,39 +1348,100 @@ +@@ -852,39 +1350,90 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -9844,6 +9846,13 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + + + + + + +@@ -912,6 +1461,25 @@ + + + + + + @@ -9854,13 +9863,6 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + + + - - - -@@ -912,6 +1469,15 @@ - - - + + + @@ -9873,7 +9875,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then -@@ -929,385 +1495,1223 @@ +@@ -929,95 +1497,133 @@ fi done if test -z "$ac_aux_dir"; then @@ -9942,9 +9944,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ++ -echo "$ac_t""$ac_cv_host" 1>&6 - +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then @@ -9957,7 +9959,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } -+ + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 @@ -9980,13 +9982,13 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -#define CONFIG_M386 1 -EOF +i386) - -- cat >> confdefs.h <<\EOF ++ +cat >>confdefs.h <<\_ACEOF +#define CONFIG_M386 +_ACEOF + -+ + +- cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define CPU 386 -EOF @@ -9995,155 +9997,95 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -#define CONFIG_M486 1 -EOF +_ACEOF - -- cat >> confdefs.h <<\EOF --#define CPU 486 --EOF -- ;; --i586) cat >> confdefs.h <<\EOF --#define CONFIG_M586 1 --EOF ++ + ;; +i486) - -- cat >> confdefs.h <<\EOF --#define CPU 586 --EOF -- ;; --i686) cat >> confdefs.h <<\EOF --#define CONFIG_M686 1 --EOF ++ +cat >>confdefs.h <<\_ACEOF +#define CONFIG_M486 +_ACEOF - cat >> confdefs.h <<\EOF --#define CPU 686 --EOF -- ;; --*) cat >> confdefs.h <<\EOF --#define CONFIG_M486 1 --EOF - -- cat >> confdefs.h <<\EOF ++ +cat >>confdefs.h <<\_ACEOF #define CPU 486 -EOF - ;; --esac -- --case "$host_cpu" in --i[3456]86) systype=i386 ;; --*) systype="$host_cpu" ;; --esac +-i586) cat >> confdefs.h <<\EOF +-#define CONFIG_M586 1 +-EOF +_ACEOF - ++ + ;; +i586) +- cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF +#define CONFIG_M586 +_ACEOF - --echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:1032: checking build system type" >&5 --if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then - --# Make sure we can run config.sub. -- if $ac_config_sub sun4 >/dev/null 2>&1; then : -- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -- fi ++ ++ +cat >>confdefs.h <<\_ACEOF -+#define CPU 586 + #define CPU 586 +-EOF +- ;; +-i686) cat >> confdefs.h <<\EOF +-#define CONFIG_M686 1 +-EOF +_ACEOF - -- ac_cv_build_alias=$build -- case "$ac_cv_build_alias" in -- NONE) -- case $nonopt in -- NONE) -- ac_cv_build_alias=$host_alias ;; ++ + ;; +i686) - -- *) ac_cv_build_alias=$nonopt ;; -- esac ;; -- esac ++ +cat >>confdefs.h <<\_ACEOF +#define CONFIG_M686 +_ACEOF ++ -- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` -- ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -- ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -- ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` --else -- echo $ac_n "(cached) $ac_c" 1>&6 --fi - --echo "$ac_t""$ac_cv_build" 1>&6 +- cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF -+#define CPU 686 + #define CPU 686 +-EOF +- ;; +-*) cat >> confdefs.h <<\EOF +-#define CONFIG_M486 1 +-EOF +_ACEOF - --build=$ac_cv_build --build_alias=$ac_cv_build_alias --build_cpu=$ac_cv_build_cpu --build_vendor=$ac_cv_build_vendor --build_os=$ac_cv_build_os ++ + ;; +*) - ++ +cat >>confdefs.h <<\_ACEOF +#define CONFIG_M486 +_ACEOF - +- cat >> confdefs.h <<\EOF ++ +cat >>confdefs.h <<\_ACEOF -+#define CPU 486 + #define CPU 486 +-EOF +- ;; +_ACEOF - --if test $host != $build; then -- ac_tool_prefix=${host_alias}- --else -- ac_tool_prefix= --fi ++ + ;; -+esac + esac + + case "$host_cpu" in +@@ -1026,288 +1632,1088 @@ + esac + --# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+case "$host_cpu" in -+i[3456]86) systype=i386 ;; -+*) systype="$host_cpu" ;; -+esac -+ -+ +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1079: checking for $ac_word" >&5 --if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_CC="${ac_tool_prefix}gcc" -- break -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc" ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -10157,21 +10099,24 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + fi +done +done -+ - fi - fi --CC="$ac_cv_prog_CC" + +-echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1032: checking build system type" >&5 +-if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then ++fi ++fi +CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&6 ++if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 - else -- echo "$ac_t""no" 1>&6 ++else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi ++fi +-# Make sure we can run config.sub. +- if $ac_config_sub sun4 >/dev/null 2>&1; then : +- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC @@ -10195,10 +10140,16 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 -+ fi + fi +done +done +- ac_cv_build_alias=$build +- case "$ac_cv_build_alias" in +- NONE) +- case $nonopt in +- NONE) +- ac_cv_build_alias=$host_alias ;; +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC @@ -10210,7 +10161,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo "${ECHO_T}no" >&6 +fi --# Extract the first word of "gcc", so it can be a program name with args. +- *) ac_cv_build_alias=$nonopt ;; +- esac ;; +- esac + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" @@ -10245,27 +10198,29 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + fi +done +done -+ + +- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` +- ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +- ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +- ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 -+else + else +- echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 -+fi -+ + fi + +-echo "$ac_t""$ac_cv_build" 1>&6 +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1111: checking for $ac_word" >&5 --if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 ++set dummy gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then @@ -10287,7 +10242,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + fi +done +done -+ + +-build=$ac_cv_build +-build_alias=$ac_cv_build_alias +-build_cpu=$ac_cv_build_cpu +-build_vendor=$ac_cv_build_vendor +-build_os=$ac_cv_build_os +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC @@ -10298,12 +10258,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -+ + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi -+ + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. @@ -10312,20 +10272,10 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_CC="gcc" -- break -- fi -- done -- IFS="$ac_save_ifs" ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -10339,21 +10289,20 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + fi +done +done -+ - fi - fi --CC="$ac_cv_prog_CC" + ++fi ++fi +CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$ac_t""$CC" 1>&6 ++if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 - else -- echo "$ac_t""no" 1>&6 ++else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi ++fi +-if test $host != $build; then +- ac_tool_prefix=${host_alias}- +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC @@ -10387,24 +10336,27 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 -+else + else +- ac_tool_prefix= + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 -+fi -+ + fi + +-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1079: checking for $ac_word" >&5 +-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1141: checking for $ac_word" >&5 --if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then @@ -10414,20 +10366,17 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -- ac_prog_rejected=yes -- continue -- fi -- ac_cv_prog_CC="cc" +- ac_cv_prog_CC="${ac_tool_prefix}gcc" - break - fi - done - IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc" ++ ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do @@ -10446,22 +10395,18 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +done +done + - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift -- if test $# -gt 0; then ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift + if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift -- set dummy "$ac_dir/$ac_word" "$@" -- shift -- ac_cv_prog_CC="$@" ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi - fi ++ fi ++fi fi fi -CC="$ac_cv_prog_CC" @@ -10474,10 +10419,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi - -- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi ++fi ++ ++fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl @@ -10505,9 +10449,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + fi +done +done - --echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1190: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++ +fi +fi +CC=$ac_cv_prog_CC @@ -10518,29 +10460,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - --ac_ext=c --# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cc_cross -- --cat > conftest.$ac_ext << EOF -- --#line 1201 "configure" --#include "confdefs.h" -- --main(){return(0);} --EOF --if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- ac_cv_prog_cc_works=yes -- # If we can't run a trivial program, we are probably using a cross compiler. -- if (./conftest; exit) 2>/dev/null; then -- ac_cv_prog_cc_cross=no -- else -- ac_cv_prog_cc_cross=yes -- fi ++ + test -n "$CC" && break + done +fi @@ -10554,10 +10474,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- ac_cv_prog_cc_works=no ++else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else @@ -10575,48 +10492,13 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +done +done + - fi --rm -fr conftest* --ac_ext=c --# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' --cross_compiling=$ac_cv_prog_cc_cross -- --echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 --if test $ac_cv_prog_cc_works = no; then -- cross_linkable=no -- ac_cv_prog_cc_cross=yes -- # AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.]) --else -- cross_linkable=yes --fi --echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 --echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -- --cross_compiling=$ac_cv_prog_cc_cross -- --echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1242: checking whether we are using GNU C" >&5 --if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.c <<EOF --#ifdef __GNUC__ -- yes; --#endif --EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -- ac_cv_prog_gcc=yes ++fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 - else -- ac_cv_prog_gcc=no ++else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi @@ -10626,18 +10508,19 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + + CC=$ac_ct_CC fi -+ - fi --echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++fi --if test $ac_cv_prog_gcc = yes; then -- GCC=yes -- ac_test_CFLAGS="${CFLAGS+set}" -- ac_save_CFLAGS="$CFLAGS" -- CFLAGS= -- if test "$ac_test_CFLAGS" = set; then -- CFLAGS="$ac_save_CFLAGS" + +-# Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1111: checking for $ac_word" >&5 +-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH @@ -10724,7 +10607,14 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + break;; + esac +done -+else + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="gcc" +- break + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + @@ -10753,16 +10643,10 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no - else -- # Add "-O" to both the CC and CPP commands, to eliminate possible confusion -- # that results from __OPTIMIZE__ being defined for CC but not CPP. -- if echo "$CC " | grep ' -O[1-9 ]' > /dev/null 2>&1; then -- : # already optimizing ++ else + if test "$cross_compiling" = maybe; then + cross_compiling=yes - else -- CC="$CC -O" -- ac_cv_prog_CC="$CC" ++ else + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 @@ -10771,8 +10655,14 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi - fi -+fi +- done +- IFS="$ac_save_ifs" +-fi ++ fi + fi +-CC="$ac_cv_prog_CC" +-if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + @@ -10916,15 +10806,23 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes -+else + else +- echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no -+fi + fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ + +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1141: checking for $ac_word" >&5 +-if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 @@ -10936,7 +10834,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 -+else + else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF @@ -10974,14 +10874,42 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes -+else + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_prog_rejected=no +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- break +- fi +- done +- IFS="$ac_save_ifs" +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# -gt 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- set dummy "$ac_dir/$ac_word" "$@" +- shift +- ac_cv_prog_CC="$@" +- fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_prog_cc_g=no -+fi + fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +if test "$ac_test_CFLAGS" = set; then @@ -10998,13 +10926,16 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + else + CFLAGS= + fi -+fi + fi +-CC="$ac_cv_prog_CC" +-if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else -- GCC= +- echo "$ac_t""no" 1>&6 + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF @@ -11101,9 +11032,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC -+ -+fi -+ + +- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1190: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 @@ -11113,7 +11047,29 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac -+ + +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-cat > conftest.$ac_ext << EOF +- +-#line 1201 "configure" +-#include "confdefs.h" +- +-main(){return(0);} +-EOF +-if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- ac_cv_prog_cc_works=yes +- # If we can't run a trivial program, we are probably using a cross compiler. +- if (./conftest; exit) 2>/dev/null; then +- ac_cv_prog_cc_cross=no +- else +- ac_cv_prog_cc_cross=yes +- fi +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide @@ -11190,12 +11146,49 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : -+else + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- ac_cv_prog_cc_works=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue -+fi + fi +-rm -fr conftest* +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +-if test $ac_cv_prog_cc_works = no; then +- cross_linkable=no +- ac_cv_prog_cc_cross=yes +- # AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.]) +-else +- cross_linkable=yes +-fi +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +- +-cross_compiling=$ac_cv_prog_cc_cross +- +-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1242: checking whether we are using GNU C" >&5 +-if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.c <<EOF +-#ifdef __GNUC__ +- yes; +-#endif +-EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +- ac_cv_prog_gcc=yes +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ @@ -11234,11 +11227,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break -+else + else +- ac_cv_prog_gcc=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+fi + fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* @@ -11246,13 +11240,33 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h -+fi -+ -+else + fi + +-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +- +-if test $ac_cv_prog_gcc = yes; then +- GCC=yes +- ac_test_CFLAGS="${CFLAGS+set}" +- ac_save_CFLAGS="$CFLAGS" +- CFLAGS= +- if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +- else +- # Add "-O" to both the CC and CPP commands, to eliminate possible confusion +- # that results from __OPTIMIZE__ being defined for CC but not CPP. +- if echo "$CC " | grep ' -O[1-9 ]' > /dev/null 2>&1; then +- : # already optimizing +- else +- CC="$CC -O" +- ac_cv_prog_CC="$CC" +- fi +- fi + else +- GCC= + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -+fi + fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' @@ -11310,12 +11324,11 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu - echo "$ac_t""$LD" 1>&6 + echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6 - else -- echo "$ac_t""no" 1>&6 ++else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 - fi - ++fi ++ +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD @@ -11349,11 +11362,12 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test -n "$ac_ct_LD"; then + echo "$as_me:$LINENO: result: $ac_ct_LD" >&5 +echo "${ECHO_T}$ac_ct_LD" >&6 -+else + else +- echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 -+fi -+ + fi + + LD=$ac_ct_LD +else + LD="$ac_cv_prog_LD" @@ -11361,7 +11375,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -@@ -1320,8 +2724,7 @@ +@@ -1320,8 +2726,7 @@ enableval="$enable_3c501" enable_el1="$enable_3c501" @@ -11371,7 +11385,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c503 # Check whether --enable-3c503 or --disable-3c503 was given. -@@ -1329,8 +2732,7 @@ +@@ -1329,8 +2734,7 @@ enableval="$enable_3c503" enable_el2="$enable_3c503" @@ -11381,7 +11395,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c509 # Check whether --enable-3c509 or --disable-3c509 was given. -@@ -1338,8 +2740,7 @@ +@@ -1338,8 +2742,7 @@ enableval="$enable_3c509" enable_el3="$enable_3c509" @@ -11391,7 +11405,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c579 # Check whether --enable-3c579 or --disable-3c579 was given. -@@ -1347,8 +2748,7 @@ +@@ -1347,8 +2750,7 @@ enableval="$enable_3c579" enable_el3="$enable_3c579" @@ -11401,7 +11415,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c59x # Check whether --enable-3c59x or --disable-3c59x was given. -@@ -1356,8 +2756,7 @@ +@@ -1356,8 +2758,7 @@ enableval="$enable_3c59x" enable_vortex="$enable_3c59x" @@ -11411,7 +11425,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c90x # Check whether --enable-3c90x or --disable-3c90x was given. -@@ -1365,8 +2764,7 @@ +@@ -1365,8 +2766,7 @@ enableval="$enable_3c90x" enable_vortex="$enable_3c90x" @@ -11421,7 +11435,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hpj2577 # Check whether --enable-hpj2577 or --disable-hpj2577 was given. -@@ -1374,8 +2772,7 @@ +@@ -1374,8 +2774,7 @@ enableval="$enable_hpj2577" enable_hp100="$enable_hpj2577" @@ -11431,7 +11445,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hpj2573 # Check whether --enable-hpj2573 or --disable-hpj2573 was given. -@@ -1383,8 +2780,7 @@ +@@ -1383,8 +2782,7 @@ enableval="$enable_hpj2573" enable_hp100="$enable_hpj2573" @@ -11441,7 +11455,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hpj2585 # Check whether --enable-hpj2585 or --disable-hpj2585 was given. -@@ -1392,8 +2788,7 @@ +@@ -1392,8 +2790,7 @@ enableval="$enable_hpj2585" enable_hp100="$enable_hpj2585" @@ -11451,7 +11465,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hp27248b # Check whether --enable-hp27248b or --disable-hp27248b was given. -@@ -1401,8 +2796,7 @@ +@@ -1401,8 +2798,7 @@ enableval="$enable_hp27248b" enable_hp100="$enable_hp27248b" @@ -11461,7 +11475,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eth32 # Check whether --enable-eth32 or --disable-eth32 was given. -@@ -1410,8 +2804,7 @@ +@@ -1410,8 +2806,7 @@ enableval="$enable_eth32" enable_eth16i="$enable_eth32" @@ -11471,7 +11485,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias znote # Check whether --enable-znote or --disable-znote was given. -@@ -1419,8 +2812,7 @@ +@@ -1419,8 +2814,7 @@ enableval="$enable_znote" enable_znet="$enable_znote" @@ -11481,7 +11495,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de100 # Check whether --enable-de100 or --disable-de100 was given. -@@ -1428,8 +2820,7 @@ +@@ -1428,8 +2822,7 @@ enableval="$enable_de100" enable_depca="$enable_de100" @@ -11491,7 +11505,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de101 # Check whether --enable-de101 or --disable-de101 was given. -@@ -1437,8 +2828,7 @@ +@@ -1437,8 +2830,7 @@ enableval="$enable_de101" enable_depca="$enable_de101" @@ -11501,7 +11515,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de200 # Check whether --enable-de200 or --disable-de200 was given. -@@ -1446,8 +2836,7 @@ +@@ -1446,8 +2838,7 @@ enableval="$enable_de200" enable_depca="$enable_de200" @@ -11511,7 +11525,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de201 # Check whether --enable-de201 or --disable-de201 was given. -@@ -1455,8 +2844,7 @@ +@@ -1455,8 +2846,7 @@ enableval="$enable_de201" enable_depca="$enable_de201" @@ -11521,7 +11535,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de202 # Check whether --enable-de202 or --disable-de202 was given. -@@ -1464,8 +2852,7 @@ +@@ -1464,8 +2854,7 @@ enableval="$enable_de202" enable_depca="$enable_de202" @@ -11531,7 +11545,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de210 # Check whether --enable-de210 or --disable-de210 was given. -@@ -1473,8 +2860,7 @@ +@@ -1473,8 +2862,7 @@ enableval="$enable_de210" enable_depca="$enable_de210" @@ -11541,7 +11555,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de422 # Check whether --enable-de422 or --disable-de422 was given. -@@ -1482,8 +2868,7 @@ +@@ -1482,8 +2870,7 @@ enableval="$enable_de422" enable_depca="$enable_de422" @@ -11551,7 +11565,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de203 # Check whether --enable-de203 or --disable-de203 was given. -@@ -1491,8 +2876,7 @@ +@@ -1491,8 +2878,7 @@ enableval="$enable_de203" enable_ewrk3="$enable_de203" @@ -11561,7 +11575,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de204 # Check whether --enable-de204 or --disable-de204 was given. -@@ -1500,8 +2884,7 @@ +@@ -1500,8 +2886,7 @@ enableval="$enable_de204" enable_ewrk3="$enable_de204" @@ -11571,7 +11585,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de205 # Check whether --enable-de205 or --disable-de205 was given. -@@ -1509,8 +2892,7 @@ +@@ -1509,8 +2894,7 @@ enableval="$enable_de205" enable_ewrk3="$enable_de205" @@ -11581,7 +11595,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de425 # Check whether --enable-de425 or --disable-de425 was given. -@@ -1518,8 +2900,7 @@ +@@ -1518,8 +2902,7 @@ enableval="$enable_de425" enable_de4x5="$enable_de425" @@ -11591,7 +11605,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de434 # Check whether --enable-de434 or --disable-de434 was given. -@@ -1527,8 +2908,7 @@ +@@ -1527,8 +2910,7 @@ enableval="$enable_de434" enable_de4x5="$enable_de434" @@ -11601,7 +11615,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de435 # Check whether --enable-de435 or --disable-de435 was given. -@@ -1536,8 +2916,7 @@ +@@ -1536,8 +2918,7 @@ enableval="$enable_de435" enable_de4x5="$enable_de435" @@ -11611,7 +11625,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de450 # Check whether --enable-de450 or --disable-de450 was given. -@@ -1545,8 +2924,7 @@ +@@ -1545,8 +2926,7 @@ enableval="$enable_de450" enable_de4x5="$enable_de450" @@ -11621,7 +11635,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de500 # Check whether --enable-de500 or --disable-de500 was given. -@@ -1554,8 +2932,7 @@ +@@ -1554,8 +2934,7 @@ enableval="$enable_de500" enable_de4x5="$enable_de500" @@ -11631,7 +11645,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c507 # Check whether --enable-3c507 or --disable-3c507 was given. -@@ -1563,8 +2940,7 @@ +@@ -1563,8 +2942,7 @@ enableval="$enable_3c507" enable_el16="$enable_3c507" @@ -11641,7 +11655,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c505 # Check whether --enable-3c505 or --disable-3c505 was given. -@@ -1572,8 +2948,7 @@ +@@ -1572,8 +2950,7 @@ enableval="$enable_3c505" enable_elplus="$enable_3c505" @@ -11651,7 +11665,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ne1000 # Check whether --enable-ne1000 or --disable-ne1000 was given. -@@ -1581,8 +2956,7 @@ +@@ -1581,8 +2958,7 @@ enableval="$enable_ne1000" enable_ne2000="$enable_ne1000" @@ -11661,7 +11675,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ne # Check whether --enable-ne or --disable-ne was given. -@@ -1590,8 +2964,7 @@ +@@ -1590,8 +2966,7 @@ enableval="$enable_ne" enable_ne2000="$enable_ne" @@ -11671,7 +11685,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias at1500 # Check whether --enable-at1500 or --disable-at1500 was given. -@@ -1599,8 +2972,7 @@ +@@ -1599,8 +2974,7 @@ enableval="$enable_at1500" enable_lance="$enable_at1500" @@ -11681,7 +11695,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ne2100 # Check whether --enable-ne2100 or --disable-ne2100 was given. -@@ -1608,8 +2980,7 @@ +@@ -1608,8 +2982,7 @@ enableval="$enable_ne2100" enable_lance="$enable_ne2100" @@ -11691,7 +11705,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tulip # Check whether --enable-tulip or --disable-tulip was given. -@@ -1617,8 +2988,7 @@ +@@ -1617,8 +2990,7 @@ enableval="$enable_tulip" enable_elcp="$enable_tulip" @@ -11701,7 +11715,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias rtl8129 # Check whether --enable-rtl8129 or --disable-rtl8129 was given. -@@ -1626,8 +2996,7 @@ +@@ -1626,8 +2998,7 @@ enableval="$enable_rtl8129" enable_rtl8139="$enable_rtl8129" @@ -11711,7 +11725,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha2825 # Check whether --enable-aha2825 or --disable-aha2825 was given. -@@ -1635,8 +3004,7 @@ +@@ -1635,8 +3006,7 @@ enableval="$enable_aha2825" enable_aha152x="$enable_aha2825" @@ -11721,7 +11735,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ncr53c400 # Check whether --enable-ncr53c400 or --disable-ncr53c400 was given. -@@ -1644,8 +3012,7 @@ +@@ -1644,8 +3014,7 @@ enableval="$enable_ncr53c400" enable_ncr5380="$enable_ncr53c400" @@ -11731,7 +11745,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias t128f # Check whether --enable-t128f or --disable-t128f was given. -@@ -1653,8 +3020,7 @@ +@@ -1653,8 +3022,7 @@ enableval="$enable_t128f" enable_t128="$enable_t128f" @@ -11741,7 +11755,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias t228 # Check whether --enable-t228 or --disable-t228 was given. -@@ -1662,8 +3028,7 @@ +@@ -1662,8 +3030,7 @@ enableval="$enable_t228" enable_t128="$enable_t228" @@ -11751,7 +11765,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias am79c974 # Check whether --enable-am79c974 or --disable-am79c974 was given. -@@ -1671,8 +3036,7 @@ +@@ -1671,8 +3038,7 @@ enableval="$enable_am79c974" enable_am53c974="$enable_am79c974" @@ -11761,7 +11775,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dtc3180 # Check whether --enable-dtc3180 or --disable-dtc3180 was given. -@@ -1680,8 +3044,7 @@ +@@ -1680,8 +3046,7 @@ enableval="$enable_dtc3180" enable_dtc3280="$enable_dtc3180" @@ -11771,7 +11785,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390w # Check whether --enable-dc390w or --disable-dc390w was given. -@@ -1689,8 +3052,7 @@ +@@ -1689,8 +3054,7 @@ enableval="$enable_dc390w" enable_ncr53c8xx="$enable_dc390w" @@ -11781,7 +11795,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390u # Check whether --enable-dc390u or --disable-dc390u was given. -@@ -1698,8 +3060,7 @@ +@@ -1698,8 +3062,7 @@ enableval="$enable_dc390u" enable_ncr53c8xx="$enable_dc390u" @@ -11791,7 +11805,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390f # Check whether --enable-dc390f or --disable-dc390f was given. -@@ -1707,8 +3068,7 @@ +@@ -1707,8 +3070,7 @@ enableval="$enable_dc390f" enable_ncr53c8xx="$enable_dc390f" @@ -11801,7 +11815,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dc390 # Check whether --enable-dc390 or --disable-dc390 was given. -@@ -1716,8 +3076,7 @@ +@@ -1716,8 +3078,7 @@ enableval="$enable_dc390" enable_dc390t="$enable_dc390" @@ -11811,7 +11825,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias epic100 # Check whether --enable-epic100 or --disable-epic100 was given. -@@ -1725,19 +3084,25 @@ +@@ -1725,19 +3086,25 @@ enableval="$enable_epic100" enable_epic="$enable_epic100" @@ -11840,7 +11854,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -@@ -1749,46 +3114,61 @@ +@@ -1749,46 +3116,61 @@ # Check whether --enable-floppy or --disable-floppy was given. if test "${enable_floppy+set}" = set; then enableval="$enable_floppy" @@ -11916,7 +11930,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu -@@ -1800,30 +3180,32 @@ +@@ -1800,30 +3182,32 @@ enableval="$enable_advansys" enable_advansys="$enable_advansys" @@ -11957,7 +11971,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias BusLogic -@@ -1832,30 +3214,32 @@ +@@ -1832,30 +3216,32 @@ enableval="$enable_BusLogic" enable_buslogic="$enable_BusLogic" @@ -11998,7 +12012,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias u14-34f -@@ -1864,30 +3248,32 @@ +@@ -1864,30 +3250,32 @@ enableval="$enable_u14_34f" enable_u1434f="$enable_u14-34f" @@ -12039,7 +12053,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ultrastor -@@ -1896,30 +3282,32 @@ +@@ -1896,30 +3284,32 @@ enableval="$enable_ultrastor" enable_ultrastor="$enable_ultrastor" @@ -12080,7 +12094,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha152x -@@ -1928,30 +3316,32 @@ +@@ -1928,30 +3318,32 @@ enableval="$enable_aha152x" enable_aha152x="$enable_aha152x" @@ -12121,7 +12135,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha1542 -@@ -1960,30 +3350,32 @@ +@@ -1960,30 +3352,32 @@ enableval="$enable_aha1542" enable_aha1542="$enable_aha1542" @@ -12162,7 +12176,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aha1740 -@@ -1992,30 +3384,32 @@ +@@ -1992,30 +3386,32 @@ enableval="$enable_aha1740" enable_aha1740="$enable_aha1740" @@ -12203,7 +12217,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias aic7xxx -@@ -2024,30 +3418,32 @@ +@@ -2024,30 +3420,32 @@ enableval="$enable_aic7xxx" enable_aic7xxx="$enable_aic7xxx" @@ -12244,7 +12258,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias fdomain -@@ -2056,30 +3452,32 @@ +@@ -2056,30 +3454,32 @@ enableval="$enable_fdomain" enable_futuredomain="$enable_fdomain" @@ -12285,7 +12299,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias in2000 -@@ -2088,30 +3486,32 @@ +@@ -2088,30 +3488,32 @@ enableval="$enable_in2000" enable_in2000="$enable_in2000" @@ -12326,7 +12340,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias g_NCR5380 -@@ -2120,30 +3520,32 @@ +@@ -2120,30 +3522,32 @@ enableval="$enable_g_NCR5380" enable_ncr5380="$enable_g_NCR5380" @@ -12367,7 +12381,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias NCR53c406a -@@ -2152,30 +3554,32 @@ +@@ -2152,30 +3556,32 @@ enableval="$enable_NCR53c406a" enable_ncr53c406a="$enable_NCR53c406a" @@ -12408,7 +12422,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias pas16 -@@ -2184,30 +3588,32 @@ +@@ -2184,30 +3590,32 @@ enableval="$enable_pas16" enable_pas16="$enable_pas16" @@ -12449,7 +12463,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias seagate -@@ -2216,30 +3622,32 @@ +@@ -2216,30 +3624,32 @@ enableval="$enable_seagate" enable_seagate="$enable_seagate" @@ -12490,7 +12504,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias t128 -@@ -2248,30 +3656,32 @@ +@@ -2248,30 +3658,32 @@ enableval="$enable_t128" enable_t128="$enable_t128" @@ -12531,7 +12545,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 53c78xx -@@ -2280,30 +3690,32 @@ +@@ -2280,30 +3692,32 @@ enableval="$enable_53c78xx" enable_ncr53c7xx="$enable_53c78xx" @@ -12572,7 +12586,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eata_dma -@@ -2312,30 +3724,32 @@ +@@ -2312,30 +3726,32 @@ enableval="$enable_eata_dma" enable_eatadma="$enable_eata_dma" @@ -12613,7 +12627,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eata_pio -@@ -2344,30 +3758,32 @@ +@@ -2344,30 +3760,32 @@ enableval="$enable_eata_pio" enable_eatapio="$enable_eata_pio" @@ -12654,7 +12668,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias wd7000 -@@ -2376,30 +3792,32 @@ +@@ -2376,30 +3794,32 @@ enableval="$enable_wd7000" enable_wd7000="$enable_wd7000" @@ -12695,7 +12709,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eata -@@ -2408,30 +3826,32 @@ +@@ -2408,30 +3828,32 @@ enableval="$enable_eata" enable_eata="$enable_eata" @@ -12736,7 +12750,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias AM53C974 -@@ -2440,30 +3860,32 @@ +@@ -2440,30 +3862,32 @@ enableval="$enable_AM53C974" enable_am53c974="$enable_AM53C974" @@ -12777,7 +12791,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias dtc -@@ -2472,30 +3894,32 @@ +@@ -2472,30 +3896,32 @@ enableval="$enable_dtc" enable_dtc3280="$enable_dtc" @@ -12818,7 +12832,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ncr53c8xx -@@ -2504,30 +3928,32 @@ +@@ -2504,30 +3930,32 @@ enableval="$enable_ncr53c8xx" enable_ncr53c8xx="$enable_ncr53c8xx" @@ -12859,7 +12873,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tmscsim -@@ -2536,174 +3962,454 @@ +@@ -2536,30 +3964,32 @@ enableval="$enable_tmscsim" enable_dc390t="$enable_tmscsim" @@ -12886,39 +12900,46 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu driver_class_scsi_selected=yes - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -+#define $driver_class_scsi_option 1 + #define $driver_class_scsi_option 1 +-EOF +_ACEOF -+ -+ device_drivers="$device_drivers $driver_class_scsi_files" -+fi -+fi -+ + + device_drivers="$device_drivers $driver_class_scsi_files" + fi + fi + +-fi +fi; + -+ -+ -+# Checking for alias ppa -+# Check whether --enable-ppa or --disable-ppa was given. -+if test "${enable_ppa+set}" = set; then -+ enableval="$enable_ppa" -+ enable_ppa="$enable_ppa" -+ + + + # Checking for alias ppa +@@ -2568,142 +3998,420 @@ + enableval="$enable_ppa" + enable_ppa="$enable_ppa" + +-fi +- +fi; -+ -+# Checking for device driver option ppa -+# Check whether --enable-ppa or --disable-ppa was given. -+if test "${enable_ppa+set}" = set; then -+ enableval="$enable_ppa" + + # Checking for device driver option ppa + # Check whether --enable-ppa or --disable-ppa was given. + if test "${enable_ppa+set}" = set; then + enableval="$enable_ppa" +- if test "x$enableval" != xno; then +-cat >> confdefs.h <<\EOF + +if test "x$enableval" != xno; then + +cat >>confdefs.h <<\_ACEOF -+#define CONFIG_SCSI_PPA 1 + #define CONFIG_SCSI_PPA 1 +-EOF +_ACEOF -+ -+device_drivers="$device_drivers ppa.o" -+if test "${driver_class_scsi_selected+set}" != set; then -+ driver_class_scsi_selected=yes + + device_drivers="$device_drivers ppa.o" + if test "${driver_class_scsi_selected+set}" != set; then + driver_class_scsi_selected=yes +- cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF +#define $driver_class_scsi_option 1 +_ACEOF @@ -13184,55 +13205,55 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + +fi; + -+ + +-# Checking for alias qlogicfas +-# Check whether --enable-qlogicfas or --disable-qlogicfas was given. +-if test "${enable_qlogicfas+set}" = set; then +- enableval="$enable_qlogicfas" +- enable_qlogicfas="$enable_qlogicfas" +# Checking for alias intel-gige +# Check whether --enable-intel-gige or --disable-intel-gige was given. +if test "${enable_intel_gige+set}" = set; then + enableval="$enable_intel_gige" + enable_intel_gige="$enable_intel-gige" --# Checking for alias ppa --# Check whether --enable-ppa or --disable-ppa was given. --if test "${enable_ppa+set}" = set; then -- enableval="$enable_ppa" -- enable_ppa="$enable_ppa" +-fi +fi; --fi +# Checking for device driver option intel_gige +# Check whether --enable-intel_gige or --disable-intel_gige was given. +if test "${enable_intel_gige+set}" = set; then + enableval="$enable_intel_gige" -+if test "x$enableval" != xno; then - --# Checking for device driver option ppa --# Check whether --enable-ppa or --disable-ppa was given. --if test "${enable_ppa+set}" = set; then -- enableval="$enable_ppa" +-# Checking for device driver option qlogicfas +-# Check whether --enable-qlogicfas or --disable-qlogicfas was given. +-if test "${enable_qlogicfas+set}" = set; then +- enableval="$enable_qlogicfas" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_PPA 1 +-#define CONFIG_SCSI_QLOGIC_FAS 1 -EOF -+cat >>confdefs.h <<\_ACEOF -+#define CONFIG_INTEL_GIGE 1 -+_ACEOF ++if test "x$enableval" != xno; then --device_drivers="$device_drivers ppa.o" +-device_drivers="$device_drivers qlogicfas.o" -if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes - cat >> confdefs.h <<EOF -#define $driver_class_scsi_option 1 -EOF ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_INTEL_GIGE 1 ++_ACEOF + +- device_drivers="$device_drivers $driver_class_scsi_files" +device_drivers="$device_drivers intel-gige.o" +if test "${driver_class_net_selected+set}" != set; then + driver_class_net_selected=yes + cat >>confdefs.h <<_ACEOF +#define $driver_class_net_option 1 +_ACEOF - -- device_drivers="$device_drivers $driver_class_scsi_files" ++ + device_drivers="$device_drivers $driver_class_net_files" fi fi @@ -13241,11 +13262,11 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +fi; --# Checking for alias qlogicfas --# Check whether --enable-qlogicfas or --disable-qlogicfas was given. --if test "${enable_qlogicfas+set}" = set; then -- enableval="$enable_qlogicfas" -- enable_qlogicfas="$enable_qlogicfas" +-# Checking for alias qlogicisp +-# Check whether --enable-qlogicisp or --disable-qlogicisp was given. +-if test "${enable_qlogicisp+set}" = set; then +- enableval="$enable_qlogicisp" +- enable_qlogicisp="$enable_qlogicisp" -fi +# Checking for alias natsemi @@ -13256,20 +13277,20 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +fi; --# Checking for device driver option qlogicfas --# Check whether --enable-qlogicfas or --disable-qlogicfas was given. --if test "${enable_qlogicfas+set}" = set; then -- enableval="$enable_qlogicfas" +-# Checking for device driver option qlogicisp +-# Check whether --enable-qlogicisp or --disable-qlogicisp was given. +-if test "${enable_qlogicisp+set}" = set; then +- enableval="$enable_qlogicisp" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_QLOGIC_FAS 1 +-#define CONFIG_SCSI_QLOGIC_ISP 1 -EOF +# Checking for device driver option natsemi +# Check whether --enable-natsemi or --disable-natsemi was given. +if test "${enable_natsemi+set}" = set; then + enableval="$enable_natsemi" --device_drivers="$device_drivers qlogicfas.o" +-device_drivers="$device_drivers qlogicisp.o" -if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes - cat >> confdefs.h <<EOF @@ -13297,11 +13318,11 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +fi; --# Checking for alias qlogicisp --# Check whether --enable-qlogicisp or --disable-qlogicisp was given. --if test "${enable_qlogicisp+set}" = set; then -- enableval="$enable_qlogicisp" -- enable_qlogicisp="$enable_qlogicisp" +-# Checking for alias gdth +-# Check whether --enable-gdth or --disable-gdth was given. +-if test "${enable_gdth+set}" = set; then +- enableval="$enable_gdth" +- enable_gdth="$enable_gdth" -fi +# Checking for alias myson803 @@ -13312,20 +13333,20 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +fi; --# Checking for device driver option qlogicisp --# Check whether --enable-qlogicisp or --disable-qlogicisp was given. --if test "${enable_qlogicisp+set}" = set; then -- enableval="$enable_qlogicisp" +-# Checking for device driver option gdth +-# Check whether --enable-gdth or --disable-gdth was given. +-if test "${enable_gdth+set}" = set; then +- enableval="$enable_gdth" - if test "x$enableval" != xno; then -cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_QLOGIC_ISP 1 +-#define CONFIG_SCSI_GDTH 1 -EOF +# Checking for device driver option myson803 +# Check whether --enable-myson803 or --disable-myson803 was given. +if test "${enable_myson803+set}" = set; then + enableval="$enable_myson803" --device_drivers="$device_drivers qlogicisp.o" +-device_drivers="$device_drivers gdth.o" -if test "${driver_class_scsi_selected+set}" != set; then - driver_class_scsi_selected=yes - cat >> confdefs.h <<EOF @@ -13334,79 +13355,55 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +if test "x$enableval" != xno; then - device_drivers="$device_drivers $driver_class_scsi_files" --fi --fi +cat >>confdefs.h <<\_ACEOF +#define CONFIG_MYSON803 1 +_ACEOF - --fi ++ +device_drivers="$device_drivers myson803.o" +if test "${driver_class_net_selected+set}" != set; then + driver_class_net_selected=yes + cat >>confdefs.h <<_ACEOF +#define $driver_class_net_option 1 +_ACEOF - ++ + device_drivers="$device_drivers $driver_class_net_files" -+fi -+fi - --# Checking for alias gdth --# Check whether --enable-gdth or --disable-gdth was given. --if test "${enable_gdth+set}" = set; then -- enableval="$enable_gdth" -- enable_gdth="$enable_gdth" -+fi; + fi + fi -fi ++fi; --# Checking for device driver option gdth --# Check whether --enable-gdth or --disable-gdth was given. --if test "${enable_gdth+set}" = set; then -- enableval="$enable_gdth" -- if test "x$enableval" != xno; then --cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_GDTH 1 +-# Check whether --enable-flashpoint or --disable-flashpoint was given. +-if test "${enable_flashpoint+set}" = set; then +- enableval="$enable_flashpoint" +- +-if test ${enableval} = no; then +- cat >> confdefs.h <<\EOF +-#define CONFIG_SCSI_OMIT_FLASHPOINT 1 -EOF + +-fi +# Checking for alias ns820 +# Check whether --enable-ns820 or --disable-ns820 was given. +if test "${enable_ns820+set}" = set; then + enableval="$enable_ns820" + enable_ns820="$enable_ns820" --device_drivers="$device_drivers gdth.o" --if test "${driver_class_scsi_selected+set}" != set; then -- driver_class_scsi_selected=yes -- cat >> confdefs.h <<EOF --#define $driver_class_scsi_option 1 --EOF -+fi; - -- device_drivers="$device_drivers $driver_class_scsi_files" --fi -fi ++fi; ++ +# Checking for device driver option ns820 +# Check whether --enable-ns820 or --disable-ns820 was given. +if test "${enable_ns820+set}" = set; then + enableval="$enable_ns820" - --fi ++ +if test "x$enableval" != xno; then - ++ +cat >>confdefs.h <<\_ACEOF +#define CONFIG_NS820 1 +_ACEOF - --# Check whether --enable-flashpoint or --disable-flashpoint was given. --if test "${enable_flashpoint+set}" = set; then -- enableval="$enable_flashpoint" -- --if test ${enableval} = no; then -- cat >> confdefs.h <<\EOF --#define CONFIG_SCSI_OMIT_FLASHPOINT 1 --EOF ++ +device_drivers="$device_drivers ns820.o" +if test "${driver_class_net_selected+set}" != set; then + driver_class_net_selected=yes @@ -13415,16 +13412,14 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu +_ACEOF + device_drivers="$device_drivers $driver_class_net_files" - fi -- - fi ++fi ++fi -- +fi; -@@ -2711,46 +4417,49 @@ +@@ -2711,46 +4419,49 @@ # Check whether --enable-ne2000 or --disable-ne2000 was given. if test "${enable_ne2000+set}" = set; then enableval="$enable_ne2000" @@ -13487,7 +13482,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c509 -@@ -2759,53 +4468,56 @@ +@@ -2759,53 +4470,56 @@ enableval="$enable_3c509" enable_el3="$enable_3c509" @@ -13558,7 +13553,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c501 -@@ -2814,122 +4526,128 @@ +@@ -2814,122 +4528,128 @@ enableval="$enable_3c501" enable_el1="$enable_3c501" @@ -13722,7 +13717,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c59x -@@ -2938,30 +4656,32 @@ +@@ -2938,30 +4658,32 @@ enableval="$enable_3c59x" enable_vortex="$enable_3c59x" @@ -13763,7 +13758,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias seeq8005 -@@ -2970,30 +4690,32 @@ +@@ -2970,30 +4692,32 @@ enableval="$enable_seeq8005" enable_seeq8005="$enable_seeq8005" @@ -13804,7 +13799,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias hp100 -@@ -3002,76 +4724,80 @@ +@@ -3002,76 +4726,80 @@ enableval="$enable_hp100" enable_hp100="$enable_hp100" @@ -13906,7 +13901,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias at1700 -@@ -3080,30 +4806,32 @@ +@@ -3080,30 +4808,32 @@ enableval="$enable_at1700" enable_at1700="$enable_at1700" @@ -13947,7 +13942,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eth16i -@@ -3112,30 +4840,32 @@ +@@ -3112,30 +4842,32 @@ enableval="$enable_eth16i" enable_eth16i="$enable_eth16i" @@ -13988,7 +13983,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias znet -@@ -3144,30 +4874,32 @@ +@@ -3144,30 +4876,32 @@ enableval="$enable_znet" enable_znet="$enable_znet" @@ -14029,7 +14024,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eexpress -@@ -3176,30 +4908,32 @@ +@@ -3176,30 +4910,32 @@ enableval="$enable_eexpress" enable_eexpress="$enable_eexpress" @@ -14070,7 +14065,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eepro -@@ -3208,30 +4942,32 @@ +@@ -3208,30 +4944,32 @@ enableval="$enable_eepro" enable_eexpresspro="$enable_eepro" @@ -14111,7 +14106,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias eepro100 -@@ -3240,30 +4976,32 @@ +@@ -3240,30 +4978,32 @@ enableval="$enable_eepro100" enable_eexpresspro100="$enable_eepro100" @@ -14152,7 +14147,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias depca -@@ -3272,30 +5010,32 @@ +@@ -3272,30 +5012,32 @@ enableval="$enable_depca" enable_depca="$enable_depca" @@ -14193,7 +14188,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ewrk3 -@@ -3304,30 +5044,32 @@ +@@ -3304,30 +5046,32 @@ enableval="$enable_ewrk3" enable_ewrk3="$enable_ewrk3" @@ -14234,7 +14229,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de4x5 -@@ -3336,30 +5078,32 @@ +@@ -3336,30 +5080,32 @@ enableval="$enable_de4x5" enable_de4x5="$enable_de4x5" @@ -14275,7 +14270,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias apricot -@@ -3368,30 +5112,32 @@ +@@ -3368,30 +5114,32 @@ enableval="$enable_apricot" enable_apricot="$enable_apricot" @@ -14316,7 +14311,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias wavelan -@@ -3400,30 +5146,32 @@ +@@ -3400,30 +5148,32 @@ enableval="$enable_wavelan" enable_wavelan="$enable_wavelan" @@ -14357,7 +14352,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c507 -@@ -3432,30 +5180,32 @@ +@@ -3432,30 +5182,32 @@ enableval="$enable_3c507" enable_el16="$enable_3c507" @@ -14398,7 +14393,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c505 -@@ -3464,30 +5214,32 @@ +@@ -3464,30 +5216,32 @@ enableval="$enable_3c505" enable_elplus="$enable_3c505" @@ -14439,7 +14434,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de600 -@@ -3496,30 +5248,32 @@ +@@ -3496,30 +5250,32 @@ enableval="$enable_de600" enable_de600="$enable_de600" @@ -14480,7 +14475,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias de620 -@@ -3528,30 +5282,32 @@ +@@ -3528,30 +5284,66 @@ enableval="$enable_de620" enable_de620="$enable_de620" @@ -14515,13 +14510,46 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu fi fi --fi ++fi; ++ ++ ++ ++# Checking for alias sis900 ++# Check whether --enable-sis900 or --disable-sis900 was given. ++if test "${enable_sis900+set}" = set; then ++ enableval="$enable_sis900" ++ enable_sis900="$enable_sis900" ++ ++fi; ++ ++# Checking for device driver option sis900 ++# Check whether --enable-sis900 or --disable-sis900 was given. ++if test "${enable_sis900+set}" = set; then ++ enableval="$enable_sis900" ++ ++if test "x$enableval" != xno; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define CONFIG_SIS900 1 ++_ACEOF ++ ++device_drivers="$device_drivers sis900.o" ++if test "${driver_class_net_selected+set}" != set; then ++ driver_class_net_selected=yes ++ cat >>confdefs.h <<_ACEOF ++#define $driver_class_net_option 1 ++_ACEOF ++ ++ device_drivers="$device_drivers $driver_class_net_files" + fi ++fi ++ +fi; + # Checking for alias sk_g16 -@@ -3560,30 +5316,32 @@ +@@ -3560,30 +5352,32 @@ enableval="$enable_sk_g16" enable_skg16="$enable_sk_g16" @@ -14562,7 +14590,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ni52 -@@ -3592,30 +5350,32 @@ +@@ -3592,30 +5386,32 @@ enableval="$enable_ni52" enable_ni52="$enable_ni52" @@ -14603,7 +14631,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias ni65 -@@ -3624,30 +5384,32 @@ +@@ -3624,30 +5420,32 @@ enableval="$enable_ni65" enable_ni65="$enable_ni65" @@ -14644,7 +14672,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias atp -@@ -3656,30 +5418,32 @@ +@@ -3656,30 +5454,32 @@ enableval="$enable_atp" enable_atp="$enable_atp" @@ -14685,7 +14713,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias lance -@@ -3688,30 +5452,32 @@ +@@ -3688,30 +5488,32 @@ enableval="$enable_lance" enable_lance="$enable_lance" @@ -14726,7 +14754,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tulip -@@ -3720,30 +5486,32 @@ +@@ -3720,30 +5522,32 @@ enableval="$enable_tulip" enable_elcp="$enable_tulip" @@ -14767,7 +14795,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias fmv18x -@@ -3752,30 +5520,32 @@ +@@ -3752,30 +5556,32 @@ enableval="$enable_fmv18x" enable_fmv18x="$enable_fmv18x" @@ -14808,7 +14836,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias 3c515 -@@ -3784,30 +5554,32 @@ +@@ -3784,30 +5590,32 @@ enableval="$enable_3c515" enable_3c515="$enable_3c515" @@ -14849,7 +14877,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias pcnet32 -@@ -3816,53 +5588,56 @@ +@@ -3816,53 +5624,56 @@ enableval="$enable_pcnet32" enable_pcnet32="$enable_pcnet32" @@ -14920,7 +14948,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias yellowfin -@@ -3871,30 +5646,32 @@ +@@ -3871,30 +5682,32 @@ enableval="$enable_yellowfin" enable_yellowfin="$enable_yellowfin" @@ -14961,7 +14989,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias rtl8139 -@@ -3903,30 +5680,32 @@ +@@ -3903,30 +5716,32 @@ enableval="$enable_rtl8139" enable_rtl8139="$enable_rtl8139" @@ -15002,7 +15030,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias epic100 -@@ -3935,30 +5714,32 @@ +@@ -3935,30 +5750,32 @@ enableval="$enable_epic100" enable_epic="$enable_epic100" @@ -15043,7 +15071,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias tlan -@@ -3967,30 +5748,32 @@ +@@ -3967,30 +5784,32 @@ enableval="$enable_tlan" enable_tlan="$enable_tlan" @@ -15084,7 +15112,7 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu # Checking for alias via-rhine -@@ -3999,389 +5782,1150 @@ +@@ -3999,389 +5818,1150 @@ enableval="$enable_via_rhine" enable_viarhine="$enable_via-rhine" @@ -16528,10 +16556,10 @@ diff -Naur gnumach-20040915.orig/i386/linux/configure gnumach-20040915/i386/linu + $ac_cs_success || { (exit 1); exit 1; } +fi -diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915/i386/linux/device-drivers.h.in ---- gnumach-20040915.orig/i386/linux/device-drivers.h.in 2001-05-27 14:44:22.000000000 +0200 -+++ gnumach-20040915/i386/linux/device-drivers.h.in 2004-10-25 06:48:08.000000000 +0200 -@@ -1,84 +1,289 @@ +diff -Naur gnumach-20050501.orig/i386/linux/device-drivers.h.in gnumach-20050501/i386/linux/device-drivers.h.in +--- gnumach-20050501.orig/i386/linux/device-drivers.h.in 2001-05-27 15:44:22.000000000 +0300 ++++ gnumach-20050501/i386/linux/device-drivers.h.in 2005-05-01 19:24:45.870975992 +0300 +@@ -1,84 +1,292 @@ -/* All possible device drivers; must match Drivers.in. */ +/* device-drivers.h.in. Generated from configure.ac by autoheader. */ @@ -16791,6 +16819,9 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 +/* seeq8005 */ +#undef CONFIG_SEEQ8005 + ++/* sis900 */ ++#undef CONFIG_SIS900 ++ +/* skg16 */ +#undef CONFIG_SK_G16 + @@ -16881,14 +16912,102 @@ diff -Naur gnumach-20040915.orig/i386/linux/device-drivers.h.in gnumach-20040915 + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION -diff -Naur gnumach-20040915.orig/linux/aclocal.m4 gnumach-20040915/linux/aclocal.m4 ---- gnumach-20040915.orig/linux/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 -+++ gnumach-20040915/linux/aclocal.m4 2004-10-25 06:47:59.000000000 +0200 +diff -Naur gnumach-20050501.orig/i386/linux/device-drivers.h.in~ gnumach-20050501/i386/linux/device-drivers.h.in~ +--- gnumach-20050501.orig/i386/linux/device-drivers.h.in~ 1970-01-01 02:00:00.000000000 +0200 ++++ gnumach-20050501/i386/linux/device-drivers.h.in~ 2001-05-27 15:44:22.000000000 +0300 +@@ -0,0 +1,84 @@ ++/* All possible device drivers; must match Drivers.in. */ ++ ++#undef CONFIG_M386 ++#undef CONFIG_M486 ++#undef CONFIG_M586 ++#undef CONFIG_M686 ++#undef CPU ++#undef CONFIG_SCSI ++#undef CONFIG_INET ++#undef CONFIG_BLK_DEV_FD ++#undef CONFIG_BLK_DEV_IDE ++#undef CONFIG_SCSI_ADVANSYS ++#undef CONFIG_SCSI_BUSLOGIC ++#undef CONFIG_SCSI_OMIT_FLASHPOINT ++#undef CONFIG_SCSI_U14_34F ++#undef CONFIG_SCSI_ULTRASTOR ++#undef CONFIG_SCSI_AHA152X ++#undef CONFIG_SCSI_AHA1542 ++#undef CONFIG_SCSI_AHA1740 ++#undef CONFIG_SCSI_AIC7XXX ++#undef CONFIG_SCSI_FUTURE_DOMAIN ++#undef CONFIG_SCSI_IN2000 ++#undef CONFIG_SCSI_GENERIC_NCR5380 ++#undef CONFIG_SCSI_NCR53C406A ++#undef CONFIG_SCSI_PASS16 ++#undef CONFIG_SCSI_SEAGATE ++#undef CONFIG_SCSI_T128 ++#undef CONFIG_SCSI_NCR53C7xx ++#undef CONFIG_SCSI_EATA_DMA ++#undef CONFIG_SCSI_EATA_PIO ++#undef CONFIG_SCSI_7000FASST ++#undef CONFIG_SCSI_EATA ++#undef CONFIG_SCSI_AM53C974 ++#undef CONFIG_SCSI_DTC3280 ++#undef CONFIG_SCSI_NCR53C8XX ++#undef CONFIG_SCSI_DC390T ++#undef CONFIG_SCSI_PPA ++#undef CONFIG_SCSI_QLOGIC_FAS ++#undef CONFIG_SCSI_QLOGIC_ISP ++#undef CONFIG_SCSI_GDTH ++#undef CONFIG_NE2000 ++#undef CONFIG_EL2 ++#undef CONFIG_EL3 ++#undef CONFIG_WD80x3 ++#undef CONFIG_EL1 ++#undef CONFIG_ULTRA ++#undef CONFIG_ULTRA32 ++#undef CONFIG_HPLAN_PLUS ++#undef CONFIG_HPLAN ++#undef CONFIG_VORTEX ++#undef CONFIG_SEEQ8005 ++#undef CONFIG_HP100 ++#undef CONFIG_AC3200 ++#undef CONFIG_E2100 ++#undef CONFIG_AT1700 ++#undef CONFIG_ETH16I ++#undef CONFIG_ZNET ++#undef CONFIG_EEXPRESS ++#undef CONFIG_EEXPRESS_PRO ++#undef CONFIG_EEXPRESS_PRO100B ++#undef CONFIG_DEPCA ++#undef CONFIG_EWRK3 ++#undef CONFIG_DE4X5 ++#undef CONFIG_APRICOT ++#undef CONFIG_WAVELAN ++#undef CONFIG_EL16 ++#undef CONFIG_ELPLUS ++#undef CONFIG_DE600 ++#undef CONFIG_DE620 ++#undef CONFIG_SK_G16 ++#undef CONFIG_NI52 ++#undef CONFIG_NI65 ++#undef CONFIG_ATP ++#undef CONFIG_LANCE ++#undef CONFIG_DEC_ELCP ++#undef CONFIG_FMV18X ++#undef CONFIG_3C515 ++#undef CONFIG_PCNET32 ++#undef CONFIG_NE2K_PCI ++#undef CONFIG_YELLOWFIN ++#undef CONFIG_RTL8139 ++#undef CONFIG_EPIC ++#undef CONFIG_TLAN ++#undef CONFIG_VIA_RHINE +diff -Naur gnumach-20050501.orig/linux/aclocal.m4 gnumach-20050501/linux/aclocal.m4 +--- gnumach-20050501.orig/linux/aclocal.m4 1970-01-01 02:00:00.000000000 +0200 ++++ gnumach-20050501/linux/aclocal.m4 2005-05-01 19:24:35.475556336 +0300 @@ -0,0 +1,14 @@ -+# generated automatically by aclocal 1.9.2 -*- Autoconf -*- ++# generated automatically by aclocal 1.9.5 -*- Autoconf -*- + -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -+# Free Software Foundation, Inc. ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. @@ -16899,9 +17018,9 @@ diff -Naur gnumach-20040915.orig/linux/aclocal.m4 gnumach-20040915/linux/aclocal +# PARTICULAR PURPOSE. + +m4_include([../aclocal.m4]) -diff -Naur gnumach-20040915.orig/linux/configure gnumach-20040915/linux/configure ---- gnumach-20040915.orig/linux/configure 1999-05-23 01:35:45.000000000 +0200 -+++ gnumach-20040915/linux/configure 2004-10-25 06:48:00.000000000 +0200 +diff -Naur gnumach-20050501.orig/linux/configure gnumach-20050501/linux/configure +--- gnumach-20050501.orig/linux/configure 1999-05-23 02:35:45.000000000 +0300 ++++ gnumach-20050501/linux/configure 2005-05-01 19:24:36.512398712 +0300 @@ -1,26 +1,288 @@ #! /bin/sh - |