From e8f0541c34a9def706f8c42a625557d538ea698a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 5 Dec 2011 17:31:19 +0000 Subject: =?UTF-8?q?2011-12-05=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * libmisc/capture/capture.c: Make RTEMS_CAPTURE_* defines unsigned (Avoid implicit sign-conversions). Make rtems_capture_trigger static (Missing prototypes). Make rtems_capture_trigger static (Missing prototypes). * libmisc/capture/capture.h: Make RTEMS_CAPTURE_WATCH, RTEMS_CAPTURE_TRACED unsigned (Avoid implicit sign conversions). --- cpukit/ChangeLog | 11 +++++++++++ cpukit/libmisc/capture/capture.c | 20 ++++++++++---------- cpukit/libmisc/capture/capture.h | 4 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 365dc8c5f0..1909a1efd7 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,14 @@ +2011-12-05 Ralf Corsépius + + * libmisc/capture/capture.c: + Make RTEMS_CAPTURE_* defines unsigned (Avoid implicit + sign-conversions). + Make rtems_capture_trigger static (Missing prototypes). + Make rtems_capture_trigger static (Missing prototypes). + * libmisc/capture/capture.h: + Make RTEMS_CAPTURE_WATCH, RTEMS_CAPTURE_TRACED unsigned (Avoid + implicit sign conversions). + 2011-12-05 Ralf Corsépius * rtems/src/rtemsobjectapimaximumclass.c: diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c index ac1acc01ac..8aa9a48bb4 100644 --- a/cpukit/libmisc/capture/capture.c +++ b/cpukit/libmisc/capture/capture.c @@ -60,14 +60,14 @@ /* * Global capture flags. */ -#define RTEMS_CAPTURE_ON (1 << 0) -#define RTEMS_CAPTURE_NO_MEMORY (1 << 1) -#define RTEMS_CAPTURE_OVERFLOW (1 << 2) -#define RTEMS_CAPTURE_TRIGGERED (1 << 3) -#define RTEMS_CAPTURE_READER_ACTIVE (1 << 4) -#define RTEMS_CAPTURE_READER_WAITING (1 << 5) -#define RTEMS_CAPTURE_GLOBAL_WATCH (1 << 6) -#define RTEMS_CAPTURE_ONLY_MONITOR (1 << 7) +#define RTEMS_CAPTURE_ON (1U << 0) +#define RTEMS_CAPTURE_NO_MEMORY (1U << 1) +#define RTEMS_CAPTURE_OVERFLOW (1U << 2) +#define RTEMS_CAPTURE_TRIGGERED (1U << 3) +#define RTEMS_CAPTURE_READER_ACTIVE (1U << 4) +#define RTEMS_CAPTURE_READER_WAITING (1U << 5) +#define RTEMS_CAPTURE_GLOBAL_WATCH (1U << 6) +#define RTEMS_CAPTURE_ONLY_MONITOR (1U << 7) /* * RTEMS Capture Data. @@ -574,7 +574,7 @@ rtems_capture_record (rtems_capture_task_t* task, * See if we have triggered and if not see if this event is a * cause of a trigger. */ -bool +static bool rtems_capture_trigger (rtems_capture_task_t* ft, rtems_capture_task_t* tt, uint32_t events) @@ -1480,7 +1480,7 @@ rtems_capture_watch_get_floor (void) * Map the trigger to a bit mask. * */ -uint32_t +static uint32_t rtems_capture_map_trigger (rtems_capture_trigger_t trigger) { /* diff --git a/cpukit/libmisc/capture/capture.h b/cpukit/libmisc/capture/capture.h index f6cfe15872..2c1a5098e4 100644 --- a/cpukit/libmisc/capture/capture.h +++ b/cpukit/libmisc/capture/capture.h @@ -96,7 +96,7 @@ typedef struct rtems_capture_control_s /** * Control flags. */ -#define RTEMS_CAPTURE_WATCH (1 << 0) +#define RTEMS_CAPTURE_WATCH (1U << 0) /** * Control triggers. @@ -169,7 +169,7 @@ typedef struct rtems_capture_task_s /** * Task flags. */ -#define RTEMS_CAPTURE_TRACED (1 << 0) +#define RTEMS_CAPTURE_TRACED (1U << 0) /* * rtems_capture_record_t -- cgit v1.2.3