diff options
author | 2013-01-11 07:32:46 +0000 | |
---|---|---|
committer | 2013-01-11 07:32:46 +0000 | |
commit | 0e19f641d3186cdbf51f8ca857e2b07ab95779c2 (patch) | |
tree | 234109de1123b13f217494af4b3f8efad346d5cc /src/lib/util/vbiparse.h | |
parent | 111157ca09a9ff60fe4a9ba49173c315e94314fa (diff) |
Cleanups and version bumpmame0148
Diffstat (limited to 'src/lib/util/vbiparse.h')
-rw-r--r-- | src/lib/util/vbiparse.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/lib/util/vbiparse.h b/src/lib/util/vbiparse.h index b2fb6739f04..1a822e6cd22 100644 --- a/src/lib/util/vbiparse.h +++ b/src/lib/util/vbiparse.h @@ -48,29 +48,29 @@ ***************************************************************************/ /* size of packed VBI data */ -#define VBI_PACKED_BYTES 16 +#define VBI_PACKED_BYTES 16 /* these codes are full 24-bit codes with no parameter data */ -#define VBI_CODE_LEADIN 0x88ffff -#define VBI_CODE_LEADOUT 0x80eeee -#define VBI_CODE_STOP 0x82cfff -#define VBI_CODE_CLV 0x87ffff +#define VBI_CODE_LEADIN 0x88ffff +#define VBI_CODE_LEADOUT 0x80eeee +#define VBI_CODE_STOP 0x82cfff +#define VBI_CODE_CLV 0x87ffff /* these codes require a mask because some bits are parameters */ -#define VBI_MASK_CAV_PICTURE 0xf00000 -#define VBI_CODE_CAV_PICTURE 0xf00000 -#define VBI_MASK_CHAPTER 0xf00fff -#define VBI_CODE_CHAPTER 0x800ddd -#define VBI_MASK_CLV_TIME 0xf0ff00 -#define VBI_CODE_CLV_TIME 0xf0dd00 -#define VBI_MASK_STATUS_CX_ON 0xfff000 -#define VBI_CODE_STATUS_CX_ON 0x8dc000 -#define VBI_MASK_STATUS_CX_OFF 0xfff000 -#define VBI_CODE_STATUS_CX_OFF 0x8bc000 -#define VBI_MASK_USER 0xf0f000 -#define VBI_CODE_USER 0x80d000 -#define VBI_MASK_CLV_PICTURE 0xf0f000 -#define VBI_CODE_CLV_PICTURE 0x80e000 +#define VBI_MASK_CAV_PICTURE 0xf00000 +#define VBI_CODE_CAV_PICTURE 0xf00000 +#define VBI_MASK_CHAPTER 0xf00fff +#define VBI_CODE_CHAPTER 0x800ddd +#define VBI_MASK_CLV_TIME 0xf0ff00 +#define VBI_CODE_CLV_TIME 0xf0dd00 +#define VBI_MASK_STATUS_CX_ON 0xfff000 +#define VBI_CODE_STATUS_CX_ON 0x8dc000 +#define VBI_MASK_STATUS_CX_OFF 0xfff000 +#define VBI_CODE_STATUS_CX_OFF 0x8bc000 +#define VBI_MASK_USER 0xf0f000 +#define VBI_CODE_USER 0x80d000 +#define VBI_MASK_CLV_PICTURE 0xf0f000 +#define VBI_CODE_CLV_PICTURE 0x80e000 @@ -78,8 +78,8 @@ MACROS ***************************************************************************/ -#define VBI_CAV_PICTURE(x) (((((x) >> 16) & 0x07) * 10000) + ((((x) >> 12) & 0x0f) * 1000) + ((((x) >> 8) & 0x0f) * 100) + ((((x) >> 4) & 0x0f) * 10) + ((((x) >> 0) & 0x0f) * 1)) -#define VBI_CHAPTER(x) (((((x) >> 16) & 0x07) * 10) + ((((x) >> 12) & 0x0f) * 1)) +#define VBI_CAV_PICTURE(x) (((((x) >> 16) & 0x07) * 10000) + ((((x) >> 12) & 0x0f) * 1000) + ((((x) >> 8) & 0x0f) * 100) + ((((x) >> 4) & 0x0f) * 10) + ((((x) >> 0) & 0x0f) * 1)) +#define VBI_CHAPTER(x) (((((x) >> 16) & 0x07) * 10) + ((((x) >> 12) & 0x0f) * 1)) @@ -89,11 +89,11 @@ struct vbi_metadata { - UINT8 white; /* white flag: on or off */ - UINT32 line16; /* line 16 code */ - UINT32 line17; /* line 17 code */ - UINT32 line18; /* line 18 code */ - UINT32 line1718; /* most plausible value from lines 17/18 */ + UINT8 white; /* white flag: on or off */ + UINT32 line16; /* line 16 code */ + UINT32 line17; /* line 17 code */ + UINT32 line18; /* line 18 code */ + UINT32 line1718; /* most plausible value from lines 17/18 */ }; |