Merge branch 'master' of git://git.denx.de/u-boot-samsung

[karo-tx-uboot.git] / drivers / net / pcnet.c

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index 386fa50bda09a5a485275f7ae18bfc1724396e8c..e994cb690197f722f50ef03f6fd2c8c2035e11f0 100644 (file)
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -26,6 +26,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
 
@@ -45,9 +46,6 @@
 #define PCNET_DEBUG2(fmt,args...)
 #endif
 
-#if defined(CONFIG_CMD_NET) \
-       && defined(CONFIG_NET_MULTI) && defined(CONFIG_PCNET)
-
 #if !defined(CONF_PCNET_79C973) && defined(CONF_PCNET_79C975)
 #error "Macro for PCnet chip version is not defined!"
 #endif
@@ -169,7 +167,6 @@ static struct pci_device_id supported[] = {
 
 int pcnet_initialize (bd_t * bis)
 {
-<<<<<<< HEAD:drivers/net/pcnet.c
        pci_dev_t devbusfn;
        struct eth_device *dev;
        u16 command, status;
@@ -190,6 +187,11 @@ int pcnet_initialize (bd_t * bis)
                 * Allocate and pre-fill the device structure.
                 */
                dev = (struct eth_device *) malloc (sizeof *dev);
+               if (!dev) {
+                       printf("pcnet: Can not allocate memory\n");
+                       break;
+               }
+               memset(dev, 0, sizeof(*dev));
                dev->priv = (void *) devbusfn;
                sprintf (dev->name, "pcnet#%d", dev_nr);
 
@@ -232,59 +234,6 @@ int pcnet_initialize (bd_t * bis)
                dev->recv = pcnet_recv;
 
                eth_register (dev);
-=======
-    pci_dev_t devbusfn;
-    struct eth_device* dev;
-    u16 command, status;
-    int dev_nr = 0;
-
-    PCNET_DEBUG1("\npcnet_initialize...\n");
-
-    for (dev_nr = 0; ; dev_nr++) {
-
-       /*
-        * Find the PCnet PCI device(s).
-        */
-       if ((devbusfn = pci_find_devices(supported, dev_nr)) < 0) {
-           break;
-       }
-
-       /*
-        * Allocate and pre-fill the device structure.
-        */
-       dev = (struct eth_device*) malloc(sizeof *dev);
-       dev->priv = (void *)devbusfn;
-       sprintf(dev->name, "pcnet#%d", dev_nr);
-
-       /*
-        * Setup the PCI device.
-        */
-       pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, (unsigned int *)&dev->iobase);
-       dev->iobase=pci_io_to_phys(devbusfn,dev->iobase);
-       dev->iobase &= ~0xf;
-
-       PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%x: ",
-              dev->name, devbusfn, dev->iobase);
-
-       command = PCI_COMMAND_IO | PCI_COMMAND_MASTER;
-       pci_write_config_word(devbusfn, PCI_COMMAND, command);
-       pci_read_config_word(devbusfn, PCI_COMMAND, &status);
-       if ((status & command) != command) {
-           printf("%s: Couldn't enable IO access or Bus Mastering\n",
-                  dev->name);
-           free(dev);
-           continue;
-       }
-
-       pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x40);
-
-       /*
-        * Probe the PCnet chip.
-        */
-       if (pcnet_probe(dev, bis, dev_nr) < 0) {
-           free(dev);
-           continue;
->>>>>>> Fixed pcnet io_base:drivers/net/pcnet.c
        }
 
        udelay (10 * 1000);
@@ -591,4 +540,3 @@ static void pcnet_halt (struct eth_device *dev)
                printf ("%s: TIMEOUT: controller reset failed\n", dev->name);
        }
 }
-#endif