RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-03-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* libchip/network/dec21140.c: Use __PPC__ instead of __PPC.
	Cosmetics.
This commit is contained in:
Ralf Corsepius
2004-03-09 10:08:33 +00:00
parent 5569cec2a1
commit 51b9899971
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-03-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* libchip/network/dec21140.c: Use __PPC__ instead of __PPC.
Cosmetics.
2004-03-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2004-03-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/canonicalize-tools.m4: Revert Joel's 2004-03-04's patch. * aclocal/canonicalize-tools.m4: Revert Joel's 2004-03-04's patch.

19
c/src/libchip/network/dec21140.c
View File

@@ -86,7 +86,7 @@
#if defined(__i386__) #if defined(__i386__)
#include <irq.h> #include <irq.h>
#endif #endif
#if defined(__PPC) #if defined(__PPC__)
#include <bsp/irq.h> #include <bsp/irq.h>
#endif #endif
@@ -152,7 +152,7 @@
#define RESET_CHIP 0x00000001 #define RESET_CHIP 0x00000001
#if defined(__PPC) #if defined(__PPC__)
#define CSR0_MODE 0x0030e002 /* 01b08000 */ #define CSR0_MODE 0x0030e002 /* 01b08000 */
#else #else
#define CSR0_MODE 0x0020e002 /* 01b08000 */ #define CSR0_MODE 0x0020e002 /* 01b08000 */
@@ -232,7 +232,7 @@ static rtems_event_set unit_signals[NDECDRIVER]= { RTEMS_EVENT_1,
RTEMS_EVENT_8 }; RTEMS_EVENT_8 };
#if defined(__PPC) #if defined(__PPC__)
#define phys_to_bus(address) ((unsigned int)((address)) + PCI_DRAM_OFFSET) #define phys_to_bus(address) ((unsigned int)((address)) + PCI_DRAM_OFFSET)
#define bus_to_phys(address) ((unsigned int)((address)) - PCI_DRAM_OFFSET) #define bus_to_phys(address) ((unsigned int)((address)) - PCI_DRAM_OFFSET)
#define CPU_CACHE_ALIGNMENT_FOR_BUFFER PPC_CACHE_ALIGNMENT #define CPU_CACHE_ALIGNMENT_FOR_BUFFER PPC_CACHE_ALIGNMENT
@@ -1015,7 +1015,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
int diag; int diag;
unsigned int deviceId; unsigned int deviceId;
#endif #endif
#if defined(__PPC) #if defined(__PPC__)
int pbus, pdev, pfun; int pbus, pdev, pfun;
int tmp; int tmp;
unsigned int lvalue; unsigned int lvalue;
@@ -1064,7 +1064,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
rtems_panic("DEC PCI network card not found !!\n"); rtems_panic("DEC PCI network card not found !!\n");
} }
#endif #endif
#if defined(__PPC) #if defined(__PPC__)
/* /*
* Find the board * Find the board
*/ */
@@ -1155,7 +1155,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
pcib_conf_read8(signature, 60, &interrupt); pcib_conf_read8(signature, 60, &interrupt);
cvalue = interrupt; cvalue = interrupt;
#endif #endif
#if defined(__PPC) #if defined(__PPC__)
(void)pci_read_config_dword(pbus, (void)pci_read_config_dword(pbus,
pdev, pdev,
pfun, pfun,
@@ -1187,7 +1187,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
** Prep the board ** Prep the board
*/ */
#if defined(__PPC) #if defined(__PPC__)
pci_write_config_word(pbus, pdev, pfun, pci_write_config_word(pbus, pdev, pfun,
PCI_COMMAND, PCI_COMMAND,
(unsigned16) ( PCI_COMMAND_MEMORY | (unsigned16) ( PCI_COMMAND_MEMORY |
@@ -1232,7 +1232,7 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
sc->arpcom.ac_enaddr[2*i+1] = rombuf.c[20+2*i]; sc->arpcom.ac_enaddr[2*i+1] = rombuf.c[20+2*i];
} }
#endif #endif
#if defined(__PPC) #if defined(__PPC__)
memcpy (sc->arpcom.ac_enaddr, rombuf.c+20, ETHER_ADDR_LEN); memcpy (sc->arpcom.ac_enaddr, rombuf.c+20, ETHER_ADDR_LEN);
#endif #endif
} }
@@ -1292,6 +1292,3 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
}; };
#endif /* DEC21140_SUPPORTED */ #endif /* DEC21140_SUPPORTED */
/* eof */