Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49345103 authored by David S. Miller's avatar David S. Miller
Browse files

[TULIP]: Use CONFIG_SPARC consistently in ifdef tests. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49b6e95f

drivers/net/tulip/de2104x.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ MODULE_PARM_DESC (debug, "de2104x bitmapped message enable number"); 


/* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */

#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \

        || defined(__sparc__) || defined(__ia64__) \

        || defined(CONFIG_SPARC) || defined(__ia64__) \

        || defined(__sh__) || defined(__mips__)

static int rx_copybreak = 1518;

#else

drivers/net/tulip/de4x5.c

+3 −7
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) 
	sprintf(lp->adapter_name,"%s (%s)", name, gendev->bus_id);



	lp->dma_size = (NUM_RX_DESC + NUM_TX_DESC) * sizeof(struct de4x5_desc);

#if defined(__alpha__) || defined(__powerpc__) || defined(__sparc_v9__) || defined(DE4X5_DO_MEMCPY)

#if defined(__alpha__) || defined(__powerpc__) || defined(CONFIG_SPARC) || defined(DE4X5_DO_MEMCPY)

	lp->dma_size += RX_BUFF_SZ * NUM_RX_DESC + DE4X5_ALIGN;

#endif

	lp->rx_ring = dma_alloc_coherent(gendev, lp->dma_size,
@@ -1175,7 +1175,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) 
	** Set up the RX descriptor ring (Intels)

	** Allocate contiguous receive buffers, long word aligned (Alphas)

	*/

#if !defined(__alpha__) && !defined(__powerpc__) && !defined(__sparc_v9__) && !defined(DE4X5_DO_MEMCPY)

#if !defined(__alpha__) && !defined(__powerpc__) && !defined(CONFIG_SPARC) && !defined(DE4X5_DO_MEMCPY)

	for (i=0; i<NUM_RX_DESC; i++) {

	    lp->rx_ring[i].status = 0;

	    lp->rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ);
@@ -1252,11 +1252,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) 
	    mii_get_phy(dev);

	}



#ifndef __sparc_v9__

	printk("      and requires IRQ%d (provided by %s).\n", dev->irq,

#else

	printk("      and requires IRQ%x (provided by %s).\n", dev->irq,

#endif

	       ((lp->bus == PCI) ? "PCI BIOS" : "EISA CNFG"));

    }
@@ -3627,7 +3623,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len) 
    struct de4x5_private *lp = netdev_priv(dev);

    struct sk_buff *p;



#if !defined(__alpha__) && !defined(__powerpc__) && !defined(__sparc_v9__) && !defined(DE4X5_DO_MEMCPY)

#if !defined(__alpha__) && !defined(__powerpc__) && !defined(CONFIG_SPARC) && !defined(DE4X5_DO_MEMCPY)

    struct sk_buff *ret;

    u_long i=0, tmp;

drivers/net/tulip/tulip_core.c

+6 −6
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <asm/unaligned.h>

#include <asm/uaccess.h>



#ifdef __sparc__

#ifdef CONFIG_SPARC

#include <asm/pbm.h>

#endif
@@ -67,7 +67,7 @@ const char * const medianame[32] = { 


/* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */

#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \

	|| defined(__sparc__) || defined(__ia64__) \

	|| defined(CONFIG_SPARC) || defined(__ia64__) \

	|| defined(__sh__) || defined(__mips__)

static int rx_copybreak = 1518;

#else
@@ -91,7 +91,7 @@ static int rx_copybreak = 100; 
static int csr0 = 0x01A00000 | 0xE000;

#elif defined(__i386__) || defined(__powerpc__) || defined(__x86_64__)

static int csr0 = 0x01A00000 | 0x8000;

#elif defined(__sparc__) || defined(__hppa__)

#elif defined(CONFIG_SPARC) || defined(__hppa__)

/* The UltraSparc PCI controllers will disconnect at every 64-byte

 * crossing anyways so it makes no sense to tell Tulip to burst

 * any more than that.
@@ -1315,7 +1315,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, 
	/* DM9102A has troubles with MRM & clear reserved bits 24:22, 20, 16, 7:1 */

	if (tulip_uli_dm_quirk(pdev)) {

		csr0 &= ~0x01f100ff;

#if defined(__sparc__)

#if defined(CONFIG_SPARC)

                csr0 = (csr0 & ~0xff00) | 0xe000;

#endif

	}
@@ -1535,14 +1535,14 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, 
	   Many PCI BIOSes also incorrectly report the IRQ line, so we correct

	   that here as well. */

	if (sum == 0  || sum == 6*0xff) {

#if defined(__sparc__)

#if defined(CONFIG_SPARC)

		struct pcidev_cookie *pcp = pdev->sysdata;

#endif

		eeprom_missing = 1;

		for (i = 0; i < 5; i++)

			dev->dev_addr[i] = last_phys_addr[i];

		dev->dev_addr[i] = last_phys_addr[i] + 1;

#if defined(__sparc__)

#if defined(CONFIG_SPARC)

		if (pcp) {

			const unsigned char *addr;

			int len;

drivers/net/tulip/winbond-840.c

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ static void init_registers(struct net_device *dev) 
	}

#elif defined(__powerpc__) || defined(__i386__) || defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)

	i |= 0xE000;

#elif defined(__sparc__) || defined (CONFIG_PARISC)

#elif defined(CONFIG_SPARC) || defined (CONFIG_PARISC)

	i |= 0x4800;

#else

#warning Processor architecture undefined

drivers/net/tulip/xircom_tulip_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int rx_copybreak = 100; 
static int csr0 = 0x01A00000 | 0xE000;

#elif defined(__powerpc__)

static int csr0 = 0x01B00000 | 0x8000;

#elif defined(__sparc__)

#elif defined(CONFIG_SPARC)

static int csr0 = 0x01B00080 | 0x8000;

#elif defined(__i386__)

static int csr0 = 0x01A00000 | 0x8000;