Skip to content

Commit

Permalink
Rename struct capt_status to capt_status_s
Browse files Browse the repository at this point in the history
Signed-off-by: Alexey Galakhov <agalakhov@gmail.com>
  • Loading branch information
agalakhov committed Sep 23, 2013
1 parent 0cbd372 commit e693d0a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/capt-status.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <string.h>
#include <unistd.h>

static struct capt_status status;
static struct capt_status_s status;

static void decode_status(const uint8_t *s, size_t size)
{
Expand Down Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions src/capt-status.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "std.h"

struct capt_status {
struct capt_status_s {
uint16_t status[7];

uint16_t page_decoding;
Expand Down Expand Up @@ -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);

0 comments on commit e693d0a

Please sign in to comment.