Changeset 8c93623 in rtems
- Timestamp:
- 03/31/04 03:23:51 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- cba5e81
- Parents:
- ed9e449
- Location:
- c/src/lib/libbsp/powerpc/eth_comm
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
red9e449 r8c93623 1 2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org> 2 3 * include/bsp.h, include/canbus.h, include/info.h, 4 network/network.c, startup/bspstart.c: Convert to using c99 fixed 5 size types. 6 1 7 2004-02-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 8 -
c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h
red9e449 r8c93623 114 114 void bsp_cleanup( void ); 115 115 116 void M860ExecuteRISC( rtems_unsigned16command );116 void M860ExecuteRISC( uint16_t command ); 117 117 void *M860AllocateBufferDescriptors( int count ); 118 118 void *M860AllocateRiscTimers( int count ); -
c/src/lib/libbsp/powerpc/eth_comm/include/canbus.h
red9e449 r8c93623 21 21 22 22 typedef struct i82527_msg_t_ { 23 rtems_unsigned8ctrl0 __attribute__ ((packed)); /* Control 0 register */24 rtems_unsigned8ctrl1 __attribute__ ((packed)); /* Control 1 register */25 rtems_unsigned32arb __attribute__ ((packed)); /* Arbitration reg */26 rtems_unsigned8cfg __attribute__ ((packed)); /* Message config reg */27 rtems_unsigned8data[8] __attribute__ ((packed)); /* Actual message */23 uint8_t ctrl0 __attribute__ ((packed)); /* Control 0 register */ 24 uint8_t ctrl1 __attribute__ ((packed)); /* Control 1 register */ 25 uint32_t arb __attribute__ ((packed)); /* Arbitration reg */ 26 uint8_t cfg __attribute__ ((packed)); /* Message config reg */ 27 uint8_t data[8] __attribute__ ((packed)); /* Actual message */ 28 28 } i82527_msg_t; 29 29 30 30 typedef struct i82527_t_ { 31 rtems_unsigned8ctrl __attribute__ ((packed)); /* Control register */32 rtems_unsigned8status __attribute__ ((packed)); /* Status register */33 rtems_unsigned8cir __attribute__ ((packed)); /* CPU interface reg */34 rtems_unsigned8_res0 __attribute__ ((packed));35 rtems_unsigned16hsr __attribute__ ((packed)); /* High speed read */36 rtems_unsigned16gms __attribute__ ((packed)); /* Global Mask - std */37 rtems_unsigned32gml __attribute__ ((packed)); /* Global Mask - long */38 rtems_unsigned32mlm __attribute__ ((packed)); /* Mask last message */31 uint8_t ctrl __attribute__ ((packed)); /* Control register */ 32 uint8_t status __attribute__ ((packed)); /* Status register */ 33 uint8_t cir __attribute__ ((packed)); /* CPU interface reg */ 34 uint8_t _res0 __attribute__ ((packed)); 35 uint16_t hsr __attribute__ ((packed)); /* High speed read */ 36 uint16_t gms __attribute__ ((packed)); /* Global Mask - std */ 37 uint32_t gml __attribute__ ((packed)); /* Global Mask - long */ 38 uint32_t mlm __attribute__ ((packed)); /* Mask last message */ 39 39 i82527_msg_t msg1 __attribute__ ((packed)); /* Message 1 */ 40 rtems_unsigned8clkout __attribute__ ((packed)); /* CLKOUT register */40 uint8_t clkout __attribute__ ((packed)); /* CLKOUT register */ 41 41 i82527_msg_t msg2 __attribute__ ((packed)); /* Message 2 */ 42 rtems_unsigned8bcr __attribute__ ((packed)); /* Bus config register */42 uint8_t bcr __attribute__ ((packed)); /* Bus config register */ 43 43 i82527_msg_t msg3 __attribute__ ((packed)); /* Message 3 */ 44 rtems_unsigned8btr0 __attribute__ ((packed)); /* Bit timing reg 0 */44 uint8_t btr0 __attribute__ ((packed)); /* Bit timing reg 0 */ 45 45 i82527_msg_t msg4 __attribute__ ((packed)); /* Message 4 */ 46 rtems_unsigned8btr1 __attribute__ ((packed)); /* Bit timing reg 1 */46 uint8_t btr1 __attribute__ ((packed)); /* Bit timing reg 1 */ 47 47 i82527_msg_t msg5 __attribute__ ((packed)); /* Message 5 */ 48 rtems_unsigned8intr __attribute__ ((packed)); /* Interrupt register */48 uint8_t intr __attribute__ ((packed)); /* Interrupt register */ 49 49 i82527_msg_t msg6 __attribute__ ((packed)); /* Message 6 */ 50 rtems_unsigned8_res1 __attribute__ ((packed));50 uint8_t _res1 __attribute__ ((packed)); 51 51 i82527_msg_t msg7 __attribute__ ((packed)); /* Message 7 */ 52 rtems_unsigned8_res2 __attribute__ ((packed));52 uint8_t _res2 __attribute__ ((packed)); 53 53 i82527_msg_t msg8 __attribute__ ((packed)); /* Message 8 */ 54 rtems_unsigned8_res3 __attribute__ ((packed));54 uint8_t _res3 __attribute__ ((packed)); 55 55 i82527_msg_t msg9 __attribute__ ((packed)); /* Message 9 */ 56 rtems_unsigned8p1conf __attribute__ ((packed)); /* Port 1 config */56 uint8_t p1conf __attribute__ ((packed)); /* Port 1 config */ 57 57 i82527_msg_t msg10 __attribute__ ((packed)); /* Message 10 */ 58 rtems_unsigned8p2conf __attribute__ ((packed)); /* Port 2 config */58 uint8_t p2conf __attribute__ ((packed)); /* Port 2 config */ 59 59 i82527_msg_t msg11 __attribute__ ((packed)); /* Message 11 */ 60 rtems_unsigned8p1in __attribute__ ((packed)); /* Port 1 in */60 uint8_t p1in __attribute__ ((packed)); /* Port 1 in */ 61 61 i82527_msg_t msg12 __attribute__ ((packed)); /* Message 12 */ 62 rtems_unsigned8p2in __attribute__ ((packed)); /* Port 2 in */62 uint8_t p2in __attribute__ ((packed)); /* Port 2 in */ 63 63 i82527_msg_t msg13 __attribute__ ((packed)); /* Message 13 */ 64 rtems_unsigned8p1out __attribute__ ((packed)); /* Port 1 out */64 uint8_t p1out __attribute__ ((packed)); /* Port 1 out */ 65 65 i82527_msg_t msg14 __attribute__ ((packed)); /* Message 14 */ 66 rtems_unsigned8p2out __attribute__ ((packed)); /* Port 2 out */66 uint8_t p2out __attribute__ ((packed)); /* Port 2 out */ 67 67 i82527_msg_t msg15 __attribute__ ((packed)); /* Message 15 */ 68 rtems_unsigned8sra __attribute__ ((packed)); /* Serial reset address */68 uint8_t sra __attribute__ ((packed)); /* Serial reset address */ 69 69 } i82527_t; 70 70 -
c/src/lib/libbsp/powerpc/eth_comm/include/info.h
red9e449 r8c93623 12 12 13 13 typedef struct BoardInfoBlock_ { 14 rtems_unsigned16size; /* size of info block in bytes */15 rtems_unsigned8eth_id[6]; /* ethernet id of ethernet interface */16 rtems_unsigned32cpu_spd; /* cpu speed in Hz */17 rtems_unsigned32flash_size; /* size of flash memory in bytes */18 rtems_unsigned32ram_size; /* size of ram in bytes */19 rtems_unsigned32version; /* version of firmare (x.y format) */20 rtems_unsigned32if429; /* mask for arinc429 interface */21 rtems_unsigned32ifcsdb; /* mask for csdb interface */22 rtems_unsigned16if232; /* mask for rs232 interface */23 rtems_unsigned8ifcan; /* mask for canbus interface */24 rtems_unsigned8if568; /* mask for arinc568 interface */25 rtems_unsigned8fpn[16]; /* Frasca part number in ASCII */26 rtems_unsigned16rev; /* Board revision */27 rtems_unsigned32ip_num; /* Board IP number */14 uint16_t size; /* size of info block in bytes */ 15 uint8_t eth_id[6]; /* ethernet id of ethernet interface */ 16 uint32_t cpu_spd; /* cpu speed in Hz */ 17 uint32_t flash_size; /* size of flash memory in bytes */ 18 uint32_t ram_size; /* size of ram in bytes */ 19 uint32_t version; /* version of firmare (x.y format) */ 20 uint32_t if429; /* mask for arinc429 interface */ 21 uint32_t ifcsdb; /* mask for csdb interface */ 22 uint16_t if232; /* mask for rs232 interface */ 23 uint8_t ifcan; /* mask for canbus interface */ 24 uint8_t if568; /* mask for arinc568 interface */ 25 uint8_t fpn[16]; /* Frasca part number in ASCII */ 26 uint16_t rev; /* Board revision */ 27 uint32_t ip_num; /* Board IP number */ 28 28 29 29 } boardinfo_t; -
c/src/lib/libbsp/powerpc/eth_comm/network/network.c
red9e449 r8c93623 586 586 m860Enet_retire_tx_bd (struct m860_enet_struct *sc) 587 587 { 588 rtems_unsigned16status;588 uint16_t status; 589 589 int i; 590 590 int nRetired; … … 659 659 struct ifnet *ifp = &sc->arpcom.ac_if; 660 660 struct mbuf *m; 661 rtems_unsigned16status;661 uint16_t status; 662 662 m8xxBufferDescriptor_t *rxBd; 663 663 int rxBdIndex; … … 739 739 m = sc->rxMbuf[rxBdIndex]; 740 740 m->m_len = m->m_pkthdr.len = rxBd->length - 741 sizeof( rtems_unsigned32) -741 sizeof(uint32_t) - 742 742 sizeof(struct ether_header); 743 743 eh = mtod (m, struct ether_header *); … … 796 796 struct ifnet *ifp = &sc->arpcom.ac_if; 797 797 struct mbuf *m; 798 rtems_unsigned16status;798 uint16_t status; 799 799 m8xxBufferDescriptor_t *rxBd; 800 800 int rxBdIndex; … … 868 868 m = sc->rxMbuf[rxBdIndex]; 869 869 m->m_len = m->m_pkthdr.len = rxBd->length - 870 sizeof( rtems_unsigned32) -870 sizeof(uint32_t) - 871 871 sizeof(struct ether_header); 872 872 eh = mtod (m, struct ether_header *); … … 922 922 volatile m8xxBufferDescriptor_t *firstTxBd, *txBd; 923 923 struct mbuf *l = NULL; 924 rtems_unsigned16status;924 uint16_t status; 925 925 int nAdded; 926 926 … … 1042 1042 volatile m8xxBufferDescriptor_t *firstTxBd, *txBd; 1043 1043 /* struct mbuf *l = NULL; */ 1044 rtems_unsigned16status;1044 uint16_t status; 1045 1045 int nAdded; 1046 1046 -
c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
red9e449 r8c93623 47 47 */ 48 48 void bsp_postdriver_hook(void); 49 void bsp_libc_init( void *, u nsigned32, int );49 void bsp_libc_init( void *, uint32_t, int ); 50 50 51 51 void BSP_panic(char *s) … … 79 79 { 80 80 extern int _end; 81 rtems_unsigned32heap_start;81 uint32_t heap_start; 82 82 83 83 /* … … 96 96 } 97 97 */ 98 heap_start = ( rtems_unsigned32) &_end;98 heap_start = (uint32_t) &_end; 99 99 100 100 /* Align the heap on a natural boundary (4 bytes?) */ … … 116 116 { 117 117 extern int _end; 118 rtems_unsigned32heap_start;119 rtems_unsigned32ws_start;118 uint32_t heap_start; 119 uint32_t ws_start; 120 120 ppc_cpu_id_t myCpu; 121 121 ppc_cpu_revision_t myCpuRevision; … … 162 162 */ 163 163 164 heap_start = ( rtems_unsigned32) &_end;164 heap_start = (uint32_t) &_end; 165 165 if (heap_start & (CPU_ALIGNMENT-1)) 166 166 heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
Note: See TracChangeset
for help on using the changeset viewer.