Update Freescale copyrights to remove "All Rights Reserved"

[u-boot] / drivers / net / uli526x.c

diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 1267c5798f06774a2f10731c52f5bda3257afe1b..9477851a75e0d3253055654ac26af36bca117504 100644 (file)
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2007 Freescale Semiconductor, Inc.
  *
  * Author: Roy Zang <tie-fei.zang@freescale.com>, Sep, 2007
  *
@@ -16,15 +16,13 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
 #include <miiphy.h>
 
 /* some kernel function compatible define */
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_ULI526X)
-
 #undef DEBUG
 
 /* Board/System/Debug information/definition */
@@ -32,9 +30,9 @@
 #define ULI5261_DEVICE_ID      0x5261
 #define ULI5263_DEVICE_ID      0x5263
 /* ULi M5261 ID*/
-#define PCI_ULI5261_ID         ULI5261_DEVICE_ID << 16 | ULI_VENDOR_ID
+#define PCI_ULI5261_ID         (ULI5261_DEVICE_ID << 16 | ULI_VENDOR_ID)
 /* ULi M5263 ID*/
-#define PCI_ULI5263_ID         ULI5263_DEVICE_ID << 16 | ULI_VENDOR_ID
+#define PCI_ULI5263_ID         (ULI5263_DEVICE_ID << 16 | ULI_VENDOR_ID)
 
 #define ULI526X_IO_SIZE        0x100
 #define TX_DESC_CNT    0x10            /* Allocated Tx descriptors */
@@ -279,12 +277,12 @@ static int uli526x_init_one(struct eth_device *dev, bd_t *bis)
        db->desc_pool_ptr = (uchar *)&desc_pool_array[0];
        db->desc_pool_dma_ptr = (dma_addr_t)&desc_pool_array[0];
        if (db->desc_pool_ptr == NULL)
-               return 0;
+               return -1;
 
-       db->buf_pool_ptr = &buf_pool[0];
+       db->buf_pool_ptr = (uchar *)&buf_pool[0];
        db->buf_pool_dma_ptr = (dma_addr_t)&buf_pool[0];
        if (db->buf_pool_ptr == NULL)
-               return 0;
+               return -1;
 
        db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
        db->first_tx_desc_dma = db->desc_pool_dma_ptr;
@@ -331,7 +329,7 @@ static int uli526x_init_one(struct eth_device *dev, bd_t *bis)
        db->cr6_data |= ULI526X_TXTH_256;
        db->cr0_data = CR0_DEFAULT;
        uli526x_init(dev);
-       return 1;
+       return 0;
 }
 
 static void uli526x_disable(struct eth_device *dev)
@@ -412,7 +410,7 @@ static void uli526x_init(struct eth_device *dev)
        }
        /* Media Mode Process */
        if (!(db->media_mode & ULI526X_AUTO))
-               db->op_mode = db->media_mode;   /* Force Mode */
+               db->op_mode = db->media_mode;   /* Force Mode */
 
        /* Initialize Transmit/Receive decriptor and CR3/4 */
        uli526x_descriptor_init(db, db->ioaddr);
@@ -566,7 +564,7 @@ static int uli526x_rx_packet(struct eth_device *dev)
                        /* error summary bit check */
                        if (rdes0 & 0x8000) {
                                /* This is a error packet */
-                               printf("Eroor: rdes0: %lx\n", rdes0);
+                               printf("Error: rdes0: %x\n", rdes0);
                        }
 
                        if (!(rdes0 & 0x8000) ||
@@ -588,7 +586,7 @@ static int uli526x_rx_packet(struct eth_device *dev)
                                        __FUNCTION__, i, rxptr->rx_buf_ptr[i]);
 #endif
 
-                               NetReceive(rxptr->rx_buf_ptr, rxlen);
+                               NetReceive((uchar *)rxptr->rx_buf_ptr, rxlen);
                                uli526x_reuse_buf(rxptr);
 
                        } else {
@@ -656,7 +654,7 @@ static void uli526x_descriptor_init(struct uli526x_board_info *db,
        tmp_tx_dma = db->first_tx_desc_dma;
        for (tmp_tx = db->first_tx_desc, i = 0;
                        i < TX_DESC_CNT; i++, tmp_tx++) {
-               tmp_tx->tx_buf_ptr = tmp_buf;
+               tmp_tx->tx_buf_ptr = (char *)tmp_buf;
                tmp_tx->tdes0 = cpu_to_le32(0);
                tmp_tx->tdes1 = cpu_to_le32(0x81000000);        /* IC, chain */
                tmp_tx->tdes2 = cpu_to_le32(tmp_buf_dma);
@@ -993,4 +991,3 @@ static void set_mac_addr(struct eth_device *dev)
        udelay(10);
        return;
 }
-#endif