diff options
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 12 | ||||
-rw-r--r-- | cpukit/libcsupport/include/rtems/libio_.h | 4 | ||||
-rw-r--r-- | cpukit/libcsupport/src/libio_sockets.c | 2 | ||||
-rw-r--r-- | cpukit/libfs/src/dosfs/fat.h | 10 | ||||
-rw-r--r-- | cpukit/libfs/src/dosfs/msdos.h | 28 | ||||
-rw-r--r-- | cpukit/libfs/src/imfs/deviceio.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-monitor.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-object.c | 4 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-symbols.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/monitor.h | 2 | ||||
-rw-r--r-- | cpukit/libmisc/stackchk/internal.h | 2 | ||||
-rw-r--r-- | cpukit/rtems/inline/rtems/rtems/part.inl | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/bitfield.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/system.h | 2 | ||||
-rw-r--r-- | cpukit/score/src/mpci.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/objectextendinformation.c | 6 | ||||
-rw-r--r-- | cpukit/score/src/threadmp.c | 2 |
17 files changed, 50 insertions, 40 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index add1f733a4..40b8b7ce6b 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,15 @@ +2008-09-08 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libcsupport/include/rtems/libio_.h, libcsupport/src/libio_sockets.c, + libfs/src/dosfs/fat.h, libfs/src/dosfs/msdos.h, + libfs/src/imfs/deviceio.c, libmisc/monitor/mon-monitor.c, + libmisc/monitor/mon-object.c, libmisc/monitor/mon-symbols.c, + libmisc/monitor/monitor.h, libmisc/stackchk/internal.h, + rtems/inline/rtems/rtems/part.inl, score/include/rtems/system.h, + score/include/rtems/score/bitfield.h, score/src/mpci.c, + score/src/objectextendinformation.c, score/src/threadmp.c: Remove + extraneous spaces. + 2008-09-08 Ralf Corsépius <ralf.corsepius@rtems.org> * pppd/auth.c, pppd/ccp.c, pppd/chap.c, pppd/ipcp.c, pppd/lcp.c, diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h index 9036512695..6b326b7590 100644 --- a/cpukit/libcsupport/include/rtems/libio_.h +++ b/cpukit/libcsupport/include/rtems/libio_.h @@ -55,7 +55,7 @@ extern rtems_libio_t *rtems_libio_iop_freelist; */ #define rtems_libio_iop(_fd) \ - ((((uint32_t )(_fd)) < rtems_libio_number_iops) ? \ + ((((uint32_t)(_fd)) < rtems_libio_number_iops) ? \ &rtems_libio_iops[_fd] : 0) /* @@ -90,7 +90,7 @@ extern rtems_libio_t *rtems_libio_iop_freelist; #define rtems_libio_check_fd(_fd) \ do { \ - if ((uint32_t ) (_fd) >= rtems_libio_number_iops) { \ + if ((uint32_t) (_fd) >= rtems_libio_number_iops) { \ errno = EBADF; \ return -1; \ } \ diff --git a/cpukit/libcsupport/src/libio_sockets.c b/cpukit/libcsupport/src/libio_sockets.c index 88db941083..152ab157b3 100644 --- a/cpukit/libcsupport/src/libio_sockets.c +++ b/cpukit/libcsupport/src/libio_sockets.c @@ -32,7 +32,7 @@ struct socket *rtems_bsdnet_fdToSocket( rtems_libio_t *iop; /* same as rtems_libio_check_fd(_fd) but different return */ - if ((uint32_t )fd >= rtems_libio_number_iops) { + if ((uint32_t)fd >= rtems_libio_number_iops) { errno = EBADF; return NULL; } diff --git a/cpukit/libfs/src/dosfs/fat.h b/cpukit/libfs/src/dosfs/fat.h index 2e00ef939a..4272437ab9 100644 --- a/cpukit/libfs/src/dosfs/fat.h +++ b/cpukit/libfs/src/dosfs/fat.h @@ -76,24 +76,24 @@ extern "C" { #define FAT_FAT16 0x02 #define FAT_FAT32 0x04 -#define FAT_UNDEFINED_VALUE (uint32_t )0xFFFFFFFF +#define FAT_UNDEFINED_VALUE (uint32_t)0xFFFFFFFF #define FAT_FAT12_EOC 0x0FF8 #define FAT_FAT16_EOC 0xFFF8 -#define FAT_FAT32_EOC (uint32_t )0x0FFFFFF8 +#define FAT_FAT32_EOC (uint32_t)0x0FFFFFF8 #define FAT_FAT12_FREE 0x0000 #define FAT_FAT16_FREE 0x0000 #define FAT_FAT32_FREE 0x00000000 -#define FAT_GENFAT_EOC (uint32_t )0xFFFFFFFF -#define FAT_GENFAT_FREE (uint32_t )0x00000000 +#define FAT_GENFAT_EOC (uint32_t)0xFFFFFFFF +#define FAT_GENFAT_FREE (uint32_t)0x00000000 #define FAT_FAT12_SHIFT 0x04 #define FAT_FAT12_MASK 0x00000FFF #define FAT_FAT16_MASK 0x0000FFFF -#define FAT_FAT32_MASK (uint32_t )0x0FFFFFFF +#define FAT_FAT32_MASK (uint32_t)0x0FFFFFFF #define FAT_MAX_BPB_SIZE 90 #define FAT_TOTAL_MBR_SIZE 512 diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h index f420201788..0c98cc3446 100644 --- a/cpukit/libfs/src/dosfs/msdos.h +++ b/cpukit/libfs/src/dosfs/msdos.h @@ -83,22 +83,22 @@ typedef rtems_filesystem_node_types_t msdos_node_type_t; */ #define MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE 32 /* 32 bytes */ -#define MSDOS_DIR_NAME(x) (char *)((x) + 0) -#define MSDOS_DIR_ATTR(x) (uint8_t *)((x) + 11) -#define MSDOS_DIR_NT_RES(x) (uint8_t *)((x) + 12) -#define MSDOS_DIR_CRT_TIME_TENTH(x) (uint8_t *)((x) + 13) -#define MSDOS_DIR_CRT_TIME(x) (uint16_t *)((x) + 14) -#define MSDOS_DIR_CRT_DATE(x) (uint16_t *)((x) + 16) -#define MSDOS_DIR_LAST_ACCESS_DATE(x) (uint16_t *)((x) + 18) -#define MSDOS_DIR_FIRST_CLUSTER_HI(x) (uint16_t *)((x) + 20) -#define MSDOS_DIR_WRITE_TIME(x) (uint16_t *)((x) + 22) -#define MSDOS_DIR_WRITE_DATE(x) (uint16_t *)((x) + 24) -#define MSDOS_DIR_FIRST_CLUSTER_LOW(x) (uint16_t *)((x) + 26) -#define MSDOS_DIR_FILE_SIZE(x) (uint32_t *)((x) + 28) +#define MSDOS_DIR_NAME(x) (char *)((x) + 0) +#define MSDOS_DIR_ATTR(x) (uint8_t *)((x) + 11) +#define MSDOS_DIR_NT_RES(x) (uint8_t *)((x) + 12) +#define MSDOS_DIR_CRT_TIME_TENTH(x) (uint8_t *)((x) + 13) +#define MSDOS_DIR_CRT_TIME(x) (uint16_t *)((x) + 14) +#define MSDOS_DIR_CRT_DATE(x) (uint16_t *)((x) + 16) +#define MSDOS_DIR_LAST_ACCESS_DATE(x) (uint16_t *)((x) + 18) +#define MSDOS_DIR_FIRST_CLUSTER_HI(x) (uint16_t *)((x) + 20) +#define MSDOS_DIR_WRITE_TIME(x) (uint16_t *)((x) + 22) +#define MSDOS_DIR_WRITE_DATE(x) (uint16_t *)((x) + 24) +#define MSDOS_DIR_FIRST_CLUSTER_LOW(x) (uint16_t *)((x) + 26) +#define MSDOS_DIR_FILE_SIZE(x) (uint32_t *)((x) + 28) #define MSDOS_EXTRACT_CLUSTER_NUM(p) \ - (uint32_t )( (CF_LE_W(*MSDOS_DIR_FIRST_CLUSTER_LOW(p))) | \ - ((uint32_t )(CF_LE_W((*MSDOS_DIR_FIRST_CLUSTER_HI(p))))<<16) ) + (uint32_t)( (CF_LE_W(*MSDOS_DIR_FIRST_CLUSTER_LOW(p))) | \ + ((uint32_t)(CF_LE_W((*MSDOS_DIR_FIRST_CLUSTER_HI(p))))<<16) ) /* * Fields offset in 32 bytes long FAT Directory Entry diff --git a/cpukit/libfs/src/imfs/deviceio.c b/cpukit/libfs/src/imfs/deviceio.c index d999171d0b..5d8c383b89 100644 --- a/cpukit/libfs/src/imfs/deviceio.c +++ b/cpukit/libfs/src/imfs/deviceio.c @@ -48,7 +48,7 @@ rtems_deviceio_errno(rtems_status_code code) { int rc; - if ((rc = rtems_assoc_remote_by_local(errno_assoc, (uint32_t ) code))) + if ((rc = rtems_assoc_remote_by_local(errno_assoc, (uint32_t) code))) { errno = rc; return -1; diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index e68281c418..dc6f3824c7 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -438,7 +438,7 @@ rtems_monitor_symbols_loadup(void) rtems_symbol_t *sp; sp = rtems_symbol_create(rtems_monitor_symbols, symbol, - (uint32_t ) strtoul(value, 0, 16)); + (uint32_t) strtoul(value, 0, 16)); if (sp == 0) { fprintf(stdout,"could not define symbol '%s'\n", symbol); diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c index e5ff360830..ea1556c91d 100644 --- a/cpukit/libmisc/monitor/mon-object.c +++ b/cpukit/libmisc/monitor/mon-object.c @@ -203,8 +203,8 @@ rtems_monitor_object_canonical_next_remote( */ request.command = RTEMS_MONITOR_SERVER_CANONICAL; - request.argument0 = (uint32_t ) type; - request.argument1 = (uint32_t ) id; + request.argument0 = (uint32_t) type; + request.argument1 = (uint32_t) id; status = rtems_monitor_server_request( rtems_object_id_get_node(id), &request, &response); diff --git a/cpukit/libmisc/monitor/mon-symbols.c b/cpukit/libmisc/monitor/mon-symbols.c index 6f1c45a8e2..28d744ab06 100644 --- a/cpukit/libmisc/monitor/mon-symbols.c +++ b/cpukit/libmisc/monitor/mon-symbols.c @@ -362,7 +362,7 @@ rtems_monitor_symbol_canonical_by_value( void *value_void_p ) { - uint32_t value = (uint32_t ) value_void_p; + uint32_t value = (uint32_t) value_void_p; rtems_symbol_t *sp; sp = rtems_symbol_value_lookup(0, value); diff --git a/cpukit/libmisc/monitor/monitor.h b/cpukit/libmisc/monitor/monitor.h index 93d0e1632a..5442cc120f 100644 --- a/cpukit/libmisc/monitor/monitor.h +++ b/cpukit/libmisc/monitor/monitor.h @@ -371,7 +371,7 @@ typedef struct { /* monitor.c */ void rtems_monitor_kill(void); -void rtems_monitor_init(uint32_t ); +void rtems_monitor_init(uint32_t); void rtems_monitor_wakeup(void); void rtems_monitor_pause_cmd(int, char **, rtems_monitor_command_arg_t*, bool); void rtems_monitor_fatal_cmd(int, char **, rtems_monitor_command_arg_t*, bool); diff --git a/cpukit/libmisc/stackchk/internal.h b/cpukit/libmisc/stackchk/internal.h index 0f6389149f..a16a61e30e 100644 --- a/cpukit/libmisc/stackchk/internal.h +++ b/cpukit/libmisc/stackchk/internal.h @@ -32,7 +32,7 @@ extern "C" { #define PATTERN_SIZE_WORDS (4) #endif -#define PATTERN_SIZE_BYTES (PATTERN_SIZE_WORDS * sizeof(uint32_t )) +#define PATTERN_SIZE_BYTES (PATTERN_SIZE_WORDS * sizeof(uint32_t)) typedef struct { uint32_t pattern[ PATTERN_SIZE_WORDS ]; diff --git a/cpukit/rtems/inline/rtems/rtems/part.inl b/cpukit/rtems/inline/rtems/rtems/part.inl index 9cab7013bb..eb10dc4e58 100644 --- a/cpukit/rtems/inline/rtems/rtems/part.inl +++ b/cpukit/rtems/inline/rtems/rtems/part.inl @@ -67,7 +67,7 @@ RTEMS_INLINE_ROUTINE bool _Partition_Is_buffer_on_boundary ( { uint32_t offset; - offset = (uint32_t ) _Addresses_Subtract( + offset = (uint32_t) _Addresses_Subtract( the_buffer, the_partition->starting_address ); diff --git a/cpukit/score/include/rtems/score/bitfield.h b/cpukit/score/include/rtems/score/bitfield.h index bfeef76dfc..04a2a96f4c 100644 --- a/cpukit/score/include/rtems/score/bitfield.h +++ b/cpukit/score/include/rtems/score/bitfield.h @@ -86,7 +86,7 @@ const unsigned char __log2table[256] = { #else #define _Bitfield_Find_first_bit( _value, _bit_number ) \ { \ - register uint32_t __value = (uint32_t ) (_value); \ + register uint32_t __value = (uint32_t) (_value); \ register const unsigned char *__p = __log2table; \ \ if ( __value < 0x100 ) \ diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index 330281f0eb..c08cb788ef 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -182,7 +182,7 @@ typedef void * proc_ptr; * This macro is used to obtain the offset of a field in a structure. */ #define RTEMS_offsetof(type, field) \ - ((uint32_t ) &(((type *) 0)->field)) + ((uint32_t) &(((type *) 0)->field)) /** * The following is the extern for the RTEMS version string. diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c index d767962781..9cd7866c66 100644 --- a/cpukit/score/src/mpci.c +++ b/cpukit/score/src/mpci.c @@ -231,8 +231,7 @@ void _MPCI_Send_process_packet ( { the_packet->source_tid = _Thread_Executing->Object.id; the_packet->to_convert = - ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) / - sizeof(uint32_t ); + ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) / sizeof(uint32_t); (*_MPCI_table->send_packet)( destination, the_packet ); } @@ -254,8 +253,7 @@ uint32_t _MPCI_Send_request_packet ( the_packet->source_tid = _Thread_Executing->Object.id; the_packet->source_priority = _Thread_Executing->current_priority; the_packet->to_convert = - ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) / - sizeof(uint32_t ); + ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) / sizeof(uint32_t); _Thread_Executing->Wait.id = the_packet->id; diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c index 86355caba3..8e9e636757 100644 --- a/cpukit/score/src/objectextendinformation.c +++ b/cpukit/score/src/objectextendinformation.c @@ -121,7 +121,7 @@ void _Objects_Extend_information( object_blocks = (void**) _Workspace_Allocate( block_count * - (sizeof(void *) + sizeof(uint32_t ) + sizeof(Objects_Name *)) + + (sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) + ((maximum + minimum_index) * sizeof(Objects_Control *)) ); @@ -142,7 +142,7 @@ void _Objects_Extend_information( * */ - inactive_per_block = (uint32_t *) _Addresses_Add_offset( + inactive_per_block = (uint32_t *) _Addresses_Add_offset( object_blocks, block_count * sizeof(void*) ); local_table = (Objects_Control **) _Addresses_Add_offset( inactive_per_block, block_count * sizeof(uint32_t) ); @@ -166,7 +166,7 @@ void _Objects_Extend_information( block_count * sizeof(void*) ); memcpy( inactive_per_block, information->inactive_per_block, - block_count * sizeof(uint32_t ) ); + block_count * sizeof(uint32_t) ); memcpy( local_table, information->local_table, (information->maximum + minimum_index) * sizeof(Objects_Control *) ); diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c index 8cac0a99b9..5012aa8a5b 100644 --- a/cpukit/score/src/threadmp.c +++ b/cpukit/score/src/threadmp.c @@ -117,7 +117,7 @@ Thread_Control *_Thread_MP_Allocate_proxy ( */ #define _Thread_MP_Proxy_Active_offset \ - ((uint32_t )&(((Thread_Proxy_control *)0))->Active) + ((uint32_t)&(((Thread_Proxy_control *)0))->Active) Thread_Control *_Thread_MP_Find_proxy ( Objects_Id the_id |