From e693d0a67cd82f309f879e2d0bf250799d1eefee Mon Sep 17 00:00:00 2001 From: Alexey Galakhov Date: Mon, 23 Sep 2013 17:04:55 +0600 Subject: [PATCH] Rename struct capt_status to capt_status_s Signed-off-by: Alexey Galakhov --- src/capt-status.c | 6 +++--- src/capt-status.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/capt-status.c b/src/capt-status.c index 9ade94d..f11bed1 100644 --- a/src/capt-status.c +++ b/src/capt-status.c @@ -26,7 +26,7 @@ #include #include -static struct capt_status status; +static struct capt_status_s status; static void decode_status(const uint8_t *s, size_t size) { @@ -68,13 +68,13 @@ void capt_init_status(void) memset(&status, 0, sizeof(status)); } -const struct capt_status *capt_get_status(void) +const struct capt_status_s *capt_get_status(void) { download_status(CAPT_CHKSTATUS); return &status; } -const struct capt_status *capt_get_xstatus(void) +const struct capt_status_s *capt_get_xstatus(void) { download_status(CAPT_CHKSTATUS); if (FLAG(&status, CAPT_FL_XSTATUS_CHNG)) diff --git a/src/capt-status.h b/src/capt-status.h index 7cac138..a616cc3 100644 --- a/src/capt-status.h +++ b/src/capt-status.h @@ -21,7 +21,7 @@ #include "std.h" -struct capt_status { +struct capt_status_s { uint16_t status[7]; uint16_t page_decoding; @@ -56,11 +56,11 @@ enum capt_flags }; #undef _FL -static inline bool FLAG(const struct capt_status *status, enum capt_flags flag) +static inline bool FLAG(const struct capt_status_s *status, enum capt_flags flag) { return !! (status->status[flag >> 16] & (flag & 0xFFFF)); } -const struct capt_status *capt_get_status(void); -const struct capt_status *capt_get_xstatus(void); +const struct capt_status_s *capt_get_status(void); +const struct capt_status_s *capt_get_xstatus(void); void capt_wait_ready(void);