Changeset d8dbdc0 in rtems
- Timestamp:
- 03/29/04 22:11:51 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- 4c84d7b
- Parents:
- d6154c7
- Location:
- cpukit
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/ChangeLog
rd6154c7 rd8dbdc0 1 2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org> 2 3 * libnetworking/lib/ftpfs.c, libnetworking/lib/rtems_bsdnet_ntp.c, 4 libnetworking/lib/tftpDriver.c, libnetworking/machine/endian.h, 5 libnetworking/net/if_ppp.c, libnetworking/rtems/rtems_bsdnet.h, 6 libnetworking/rtems/rtems_bsdnet_internal.h, 7 libnetworking/rtems/rtems_glue.c, 8 libnetworking/rtems/rtems_syscall.c: Convert to using c99 fixed size 9 types. 10 1 11 2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org> 2 12 -
cpukit/libnetworking/lib/ftpfs.c
rd6154c7 rd8dbdc0 521 521 rtems_libio_t *iop, 522 522 const char *new_name, 523 u nsigned32flag,524 u nsigned32mode523 uint32_t flag, 524 uint32_t mode 525 525 ) 526 526 { … … 531 531 char *hostname = NULL; 532 532 char port_buffer[sizeof(FTP_PORT_CMD)+6*4+1+1]; 533 rtems_unsigned32my_ip;534 rtems_unsigned16my_port;533 uint32_t my_ip; 534 uint16_t my_port; 535 535 int eno = 0; 536 536 rtems_status_code rc; … … 963 963 rtems_libio_t *iop, 964 964 void *buffer, 965 u nsigned32count965 uint32_t count 966 966 ) 967 967 { … … 1017 1017 rtems_libio_t *iop, 1018 1018 const void *buffer, 1019 u nsigned32count1019 uint32_t count 1020 1020 ) 1021 1021 { -
cpukit/libnetworking/lib/rtems_bsdnet_ntp.c
rd6154c7 rd8dbdc0 36 36 37 37 struct timestamp { 38 rtems_unsigned32integer;39 rtems_unsigned32fraction;38 uint32_t integer; 39 uint32_t fraction; 40 40 }; 41 41 42 42 struct ntpPacketSmall { 43 rtems_unsigned8li_vn_mode;44 rtems_unsigned8stratum;45 rtems_signed8poll_interval;46 rtems_signed8precision;47 rtems_signed32root_delay;48 rtems_signed32root_dispersion;43 uint8_t li_vn_mode; 44 uint8_t stratum; 45 int8_t poll_interval; 46 int8_t precision; 47 int32_t root_delay; 48 int32_t root_dispersion; 49 49 char reference_identifier[4]; 50 50 struct timestamp reference_timestamp; -
cpukit/libnetworking/lib/tftpDriver.c
rd6154c7 rd8dbdc0 84 84 */ 85 85 struct tftpRWRQ { 86 rtems_unsigned16opcode;86 uint16_t opcode; 87 87 char filename_mode[TFTP_BUFSIZE]; 88 88 } tftpRWRQ; … … 92 92 */ 93 93 struct tftpDATA { 94 rtems_unsigned16opcode;95 rtems_unsigned16blocknum;96 rtems_unsigned8data[TFTP_BUFSIZE];94 uint16_t opcode; 95 uint16_t blocknum; 96 uint8_t data[TFTP_BUFSIZE]; 97 97 } tftpDATA; 98 98 … … 101 101 */ 102 102 struct tftpACK { 103 rtems_unsigned16opcode;104 rtems_unsigned16blocknum;103 uint16_t opcode; 104 uint16_t blocknum; 105 105 } tftpACK; 106 106 … … 109 109 */ 110 110 struct tftpERROR { 111 rtems_unsigned16opcode;112 rtems_unsigned16errorCode;111 uint16_t opcode; 112 uint16_t errorCode; 113 113 char errorMessage[TFTP_BUFSIZE]; 114 114 } tftpERROR; … … 127 127 * Last block number transferred 128 128 */ 129 rtems_unsigned16blocknum;129 uint16_t blocknum; 130 130 131 131 /* … … 290 290 int len; 291 291 struct { 292 rtems_unsigned16opcode;293 rtems_unsigned16errorCode;292 uint16_t opcode; 293 uint16_t errorCode; 294 294 char errorMessage[12]; 295 295 } msg; … … 540 540 rtems_libio_t *iop, 541 541 char *full_path_name, 542 u nsigned32flags,543 u nsigned32mode542 uint32_t flags, 543 uint32_t mode 544 544 ) 545 545 { … … 711 711 tp->nused = 0; 712 712 tp->blocknum = 1; 713 tp->nleft = len - 2 * sizeof ( rtems_unsigned16);713 tp->nleft = len - 2 * sizeof (uint16_t ); 714 714 tp->eof = (tp->nleft < TFTP_BUFSIZE); 715 715 if (sendAck (tp) != 0) { … … 753 753 rtems_libio_t *iop, 754 754 const char *new_name, 755 u nsigned32flags,756 u nsigned32mode755 uint32_t flags, 756 uint32_t mode 757 757 ) 758 758 { … … 795 795 rtems_libio_t *iop, 796 796 void *buffer, 797 u nsigned32count797 uint32_t count 798 798 ) 799 799 { … … 835 835 if (len >= (int)sizeof tp->pkbuf.tftpACK) { 836 836 int opcode = ntohs (tp->pkbuf.tftpDATA.opcode); 837 rtems_unsigned16nextBlock = tp->blocknum + 1;837 uint16_t nextBlock = tp->blocknum + 1; 838 838 if ((opcode == TFTP_OPCODE_DATA) 839 839 && (ntohs (tp->pkbuf.tftpDATA.blocknum) == nextBlock)) { 840 840 tp->nused = 0; 841 tp->nleft = len - 2 * sizeof ( rtems_unsigned16);841 tp->nleft = len - 2 * sizeof (uint16_t ); 842 842 tp->eof = (tp->nleft < TFTP_BUFSIZE); 843 843 tp->blocknum++; … … 870 870 int retryCount = 0; 871 871 872 wlen = tp->nused + 2 * sizeof ( rtems_unsigned16);872 wlen = tp->nused + 2 * sizeof (uint16_t ); 873 873 for (;;) { 874 874 tp->pkbuf.tftpDATA.opcode = htons (TFTP_OPCODE_DATA); … … 936 936 rtems_libio_t *iop, 937 937 const void *buffer, 938 u nsigned32count938 uint32_t count 939 939 ) 940 940 { -
cpukit/libnetworking/machine/endian.h
rd6154c7 rd8dbdc0 46 46 */ 47 47 48 #define ntohl(_x) ((long) CPU_swap_u32((u nsigned32)_x))49 #define ntohs(_x) ((short) CPU_swap_u16((u nsigned16)_x))50 #define htonl(_x) ((long) CPU_swap_u32((u nsigned32)_x))51 #define htons(_x) ((short) CPU_swap_u16((u nsigned16)_x))48 #define ntohl(_x) ((long) CPU_swap_u32((uint32_t )_x)) 49 #define ntohs(_x) ((short) CPU_swap_u16((uint16_t )_x)) 50 #define htonl(_x) ((long) CPU_swap_u32((uint32_t )_x)) 51 #define htons(_x) ((short) CPU_swap_u16((uint16_t )_x)) 52 52 53 53 #define NTOHS(x) (x) = ntohs(x) -
cpukit/libnetworking/net/if_ppp.c
rd6154c7 rd8dbdc0 389 389 { 390 390 rtems_status_code status; 391 rtems_unsigned32priority = 100;391 uint32_t priority = 100; 392 392 393 393 /* determine priority value */ -
cpukit/libnetworking/rtems/rtems_bsdnet.h
rd6154c7 rd8dbdc0 176 176 * Interface configuration. The commands are listed in `sys/sockio.h'. 177 177 */ 178 int rtems_bsdnet_ifconfig (const char *ifname, u nsigned32cmd, void *param);178 int rtems_bsdnet_ifconfig (const char *ifname, uint32_t cmd, void *param); 179 179 180 180 void rtems_bsdnet_do_bootp (void); -
cpukit/libnetworking/rtems/rtems_bsdnet_internal.h
rd6154c7 rd8dbdc0 20 20 typedef unsigned int vm_size_t; 21 21 22 #define _BSD_OFF_T_ rtems_signed3222 #define _BSD_OFF_T_ int32_t 23 23 #define _BSD_PID_T_ rtems_id 24 24 #define _BSD_VA_LIST_ char * -
cpukit/libnetworking/rtems/rtems_glue.c
rd6154c7 rd8dbdc0 61 61 #endif 62 62 static rtems_id networkDaemonTid; 63 static rtems_unsigned32networkDaemonPriority;63 static uint32_t networkDaemonPriority; 64 64 static void networkDaemon (void *task_argument); 65 65 … … 508 508 rtems_interval now; 509 509 int ticksPassed; 510 u nsigned32timeout;510 uint32_t timeout; 511 511 struct callout *c; 512 512 … … 760 760 in_cksum_hdr (const void *ip) 761 761 { 762 rtems_unsigned32sum;763 const rtems_unsigned16*sp;762 uint32_t sum; 763 const uint16_t *sp; 764 764 int i; 765 765 766 766 sum = 0; 767 sp = ( rtems_unsigned16*)ip;767 sp = (uint16_t *)ip; 768 768 for (i = 0 ; i < 10 ; i++) 769 769 sum += *sp++; … … 983 983 * Interface Configuration. 984 984 */ 985 int rtems_bsdnet_ifconfig (const char *ifname, u nsigned32cmd, void *param)985 int rtems_bsdnet_ifconfig (const char *ifname, uint32_t cmd, void *param) 986 986 { 987 987 int s, r = 0; -
cpukit/libnetworking/rtems/rtems_syscall.c
rd6154c7 rd8dbdc0 685 685 686 686 static ssize_t 687 rtems_bsdnet_read (rtems_libio_t *iop, void *buffer, u nsigned32count)687 rtems_bsdnet_read (rtems_libio_t *iop, void *buffer, uint32_t count) 688 688 { 689 689 return recv (iop->data0, buffer, count, 0); … … 691 691 692 692 static ssize_t 693 rtems_bsdnet_write (rtems_libio_t *iop, const void *buffer, u nsigned32count)693 rtems_bsdnet_write (rtems_libio_t *iop, const void *buffer, uint32_t count) 694 694 { 695 695 return send (iop->data0, buffer, count, 0); … … 697 697 698 698 static int 699 so_ioctl (rtems_libio_t *iop, struct socket *so, u nsigned32command, void *buffer)699 so_ioctl (rtems_libio_t *iop, struct socket *so, uint32_t command, void *buffer) 700 700 { 701 701 switch (command) { … … 724 724 725 725 static int 726 rtems_bsdnet_ioctl (rtems_libio_t *iop, u nsigned32command, void *buffer)726 rtems_bsdnet_ioctl (rtems_libio_t *iop, uint32_t command, void *buffer) 727 727 { 728 728 struct socket *so;
Note: See TracChangeset
for help on using the changeset viewer.