projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phylib: phy_startup() should return an error code on failure
[oweals/u-boot.git]
/
drivers
/
net
/
dc2114x.c
diff --git
a/drivers/net/dc2114x.c
b/drivers/net/dc2114x.c
index 5ae53e816b1b0d9629105e94fd599d60f26bf999..d9fcb5a13ec705fd05735bb85e9bc28d7c454ffa 100644
(file)
--- a/
drivers/net/dc2114x.c
+++ b/
drivers/net/dc2114x.c
@@
-175,7
+175,7
@@
static void read_hw_addr(struct eth_device* dev, bd_t * bis);
static void send_setup_frame(struct eth_device* dev, bd_t * bis);
static int dc21x4x_init(struct eth_device* dev, bd_t* bis);
static void send_setup_frame(struct eth_device* dev, bd_t * bis);
static int dc21x4x_init(struct eth_device* dev, bd_t* bis);
-static int dc21x4x_send(struct eth_device
* dev, volatile
void *packet, int length);
+static int dc21x4x_send(struct eth_device
*dev,
void *packet, int length);
static int dc21x4x_recv(struct eth_device* dev);
static void dc21x4x_halt(struct eth_device* dev);
#ifdef CONFIG_TULIP_SELECT_MEDIA
static int dc21x4x_recv(struct eth_device* dev);
static void dc21x4x_halt(struct eth_device* dev);
#ifdef CONFIG_TULIP_SELECT_MEDIA
@@
-245,15
+245,17
@@
int dc21x4x_initialize(bd_t *bis)
pci_write_config_word(devbusfn, PCI_COMMAND, status);
pci_read_config_word(devbusfn, PCI_COMMAND, &status);
pci_write_config_word(devbusfn, PCI_COMMAND, status);
pci_read_config_word(devbusfn, PCI_COMMAND, &status);
+#ifdef CONFIG_TULIP_USE_IO
if (!(status & PCI_COMMAND_IO)) {
printf("Error: Can not enable I/O access.\n");
continue;
}
if (!(status & PCI_COMMAND_IO)) {
printf("Error: Can not enable I/O access.\n");
continue;
}
-
- if (!(status & PCI_COMMAND_
IO
)) {
- printf("Error: Can not enable
I/O
access.\n");
+#else
+ if (!(status & PCI_COMMAND_
MEMORY
)) {
+ printf("Error: Can not enable
MEMORY
access.\n");
continue;
}
continue;
}
+#endif
if (!(status & PCI_COMMAND_MASTER)) {
printf("Error: Can not enable Bus Mastering.\n");
if (!(status & PCI_COMMAND_MASTER)) {
printf("Error: Can not enable Bus Mastering.\n");
@@
-280,6
+282,12
@@
int dc21x4x_initialize(bd_t *bis)
dev = (struct eth_device*) malloc(sizeof *dev);
dev = (struct eth_device*) malloc(sizeof *dev);
+ if (!dev) {
+ printf("Can not allocalte memory of dc21x4x\n");
+ break;
+ }
+ memset(dev, 0, sizeof(*dev));
+
#ifdef CONFIG_TULIP_FIX_DAVICOM
sprintf(dev->name, "Davicom#%d", card_number);
#else
#ifdef CONFIG_TULIP_FIX_DAVICOM
sprintf(dev->name, "Davicom#%d", card_number);
#else
@@
-382,7
+390,7
@@
static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
return 0;
}
return 0;
}
-static int dc21x4x_send(struct eth_device
* dev, volatile
void *packet, int length)
+static int dc21x4x_send(struct eth_device
*dev,
void *packet, int length)
{
int status = -1;
int i;
{
int status = -1;
int i;