1 | diff -N -P -r -c -b -X /home/posixfsw/rtems/production/diff-exclude-files c/src/libchip/network/dec21140.c /home/posixfsw/rtems/production/rtems-ss-20030703/c/src/libchip/network/dec21140.c |
---|
2 | *** c/src/libchip/network/dec21140.c Thu Sep 4 14:46:04 2003 |
---|
3 | --- /home/posixfsw/rtems/production/rtems-ss-20030703/c/src/libchip/network/dec21140.c Fri Dec 19 16:24:36 2003 |
---|
4 | *************** |
---|
5 | *** 5,13 **** |
---|
6 | * |
---|
7 | * The license and distribution terms for this file may be |
---|
8 | * found in found in the file LICENSE in this distribution or at |
---|
9 | ! * http://www.rtems.com/license/LICENSE. |
---|
10 | * |
---|
11 | ! * $Id: dec21140.c,v 1.13.2.3 2003/09/04 18:46:04 joel Exp $ |
---|
12 | * |
---|
13 | * ------------------------------------------------------------------------ |
---|
14 | * [22.05.2000,StWi/CWA] added support for the DEC/Intel 21143 chip |
---|
15 | --- 5,13 ---- |
---|
16 | * |
---|
17 | * The license and distribution terms for this file may be |
---|
18 | * found in found in the file LICENSE in this distribution or at |
---|
19 | ! * http://www.OARcorp.com/rtems/license.html. |
---|
20 | * |
---|
21 | ! * dec21140.c,v 1.15 2003/06/30 18:14:09 joel Exp |
---|
22 | * |
---|
23 | * ------------------------------------------------------------------------ |
---|
24 | * [22.05.2000,StWi/CWA] added support for the DEC/Intel 21143 chip |
---|
25 | *************** |
---|
26 | *** 1170,1177 **** |
---|
27 | PCI_BASE_ADDRESS_1, |
---|
28 | &lvalue); |
---|
29 | |
---|
30 | ! tmp = (unsigned int)(lvalue & (unsigned int)(~MEM_MASK)) |
---|
31 | ! + (unsigned int)PCI_MEM_BASE; |
---|
32 | |
---|
33 | sc->base = (unsigned int *)(tmp); |
---|
34 | |
---|
35 | --- 1170,1176 ---- |
---|
36 | PCI_BASE_ADDRESS_1, |
---|
37 | &lvalue); |
---|
38 | |
---|
39 | ! tmp = (unsigned int)(lvalue & (unsigned int)(~MEM_MASK)) + (unsigned int)PCI_MEM_BASE; |
---|
40 | |
---|
41 | sc->base = (unsigned int *)(tmp); |
---|
42 | |
---|
43 | *************** |
---|
44 | *** 1190,1200 **** |
---|
45 | #if defined(__PPC) |
---|
46 | pci_write_config_word(pbus, pdev, pfun, |
---|
47 | PCI_COMMAND, |
---|
48 | ! (unsigned16) ( PCI_COMMAND_MEMORY | |
---|
49 | ! PCI_COMMAND_MASTER | |
---|
50 | ! PCI_COMMAND_INVALIDATE | |
---|
51 | ! PCI_COMMAND_WAIT | |
---|
52 | ! PCI_COMMAND_FAST_BACK ) ); |
---|
53 | #endif |
---|
54 | #if defined(__i386__) |
---|
55 | pcib_conf_write16(signature, 0x04, ( 0x2 | 0x4 | 0x10 | 0x80 | 0x200) ); |
---|
56 | --- 1189,1197 ---- |
---|
57 | #if defined(__PPC) |
---|
58 | pci_write_config_word(pbus, pdev, pfun, |
---|
59 | PCI_COMMAND, |
---|
60 | ! (unsigned16) ( PCI_COMMAND_IO | |
---|
61 | ! PCI_COMMAND_MEMORY | |
---|
62 | ! PCI_COMMAND_MASTER ) ); |
---|
63 | #endif |
---|
64 | #if defined(__i386__) |
---|
65 | pcib_conf_write16(signature, 0x04, ( 0x2 | 0x4 | 0x10 | 0x80 | 0x200) ); |
---|
66 | |
---|