From 012ab0cf52502faf1618ef02e4530325a24ecb59 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 12 Mar 2013 10:31:29 +0200 Subject: [PATCH] --- yaml --- r: 362935 b: refs/heads/master c: 32ed6ef133f95f960d19e3f3b30246aebf8ecd36 h: refs/heads/master i: 362933: c2deb08ff6638fbcb1ed70c1e40a28806b03548b 362931: 79215a7a309a800739d5452bbdf2f510e010f754 362927: 954904c6bf1ec65a69183e027e87dcc2f69718fe v: v3 --- [refs] | 2 +- trunk/include/video/display_timing.h | 28 +++++++++++++++++----------- trunk/include/video/videomode.h | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index e47f96901010..21c9138db7cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06a3307975aac2d5b5a0e0f2e05d23e769f176b4 +refs/heads/master: 32ed6ef133f95f960d19e3f3b30246aebf8ecd36 diff --git a/trunk/include/video/display_timing.h b/trunk/include/video/display_timing.h index a8a4be5b0af7..b63471d14097 100644 --- a/trunk/include/video/display_timing.h +++ b/trunk/include/video/display_timing.h @@ -12,16 +12,22 @@ #include #include -#define DISPLAY_FLAGS_HSYNC_LOW BIT(0) -#define DISPLAY_FLAGS_HSYNC_HIGH BIT(1) -#define DISPLAY_FLAGS_VSYNC_LOW BIT(2) -#define DISPLAY_FLAGS_VSYNC_HIGH BIT(3) -#define DISPLAY_FLAGS_DE_LOW BIT(4) /* data enable flag */ -#define DISPLAY_FLAGS_DE_HIGH BIT(5) -#define DISPLAY_FLAGS_PIXDATA_POSEDGE BIT(6) /* drive data on pos. edge */ -#define DISPLAY_FLAGS_PIXDATA_NEGEDGE BIT(7) /* drive data on neg. edge */ -#define DISPLAY_FLAGS_INTERLACED BIT(8) -#define DISPLAY_FLAGS_DOUBLESCAN BIT(9) +enum display_flags { + DISPLAY_FLAGS_HSYNC_LOW = BIT(0), + DISPLAY_FLAGS_HSYNC_HIGH = BIT(1), + DISPLAY_FLAGS_VSYNC_LOW = BIT(2), + DISPLAY_FLAGS_VSYNC_HIGH = BIT(3), + + /* data enable flag */ + DISPLAY_FLAGS_DE_LOW = BIT(4), + DISPLAY_FLAGS_DE_HIGH = BIT(5), + /* drive data on pos. edge */ + DISPLAY_FLAGS_PIXDATA_POSEDGE = BIT(6), + /* drive data on neg. edge */ + DISPLAY_FLAGS_PIXDATA_NEGEDGE = BIT(7), + DISPLAY_FLAGS_INTERLACED = BIT(8), + DISPLAY_FLAGS_DOUBLESCAN = BIT(9), +}; /* * A single signal can be specified via a range of minimal and maximal values @@ -69,7 +75,7 @@ struct display_timing { struct timing_entry vback_porch; /* ver. back porch */ struct timing_entry vsync_len; /* ver. sync len */ - unsigned int flags; /* display flags */ + enum display_flags flags; /* display flags */ }; /* diff --git a/trunk/include/video/videomode.h b/trunk/include/video/videomode.h index f4ae6edfeb08..8b12e60b6173 100644 --- a/trunk/include/video/videomode.h +++ b/trunk/include/video/videomode.h @@ -29,7 +29,7 @@ struct videomode { u32 vback_porch; u32 vsync_len; - unsigned int flags; /* display flags */ + enum display_flags flags; /* display flags */ }; /**