aboutsummaryrefslogtreecommitdiff
path: root/util-linux/fbset.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/fbset.c')
-rw-r--r--util-linux/fbset.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index b5f57b1e4..83bf309a3 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -20,7 +20,7 @@
20 * 20 *
21 * This is a from-scratch implementation of fbset; but the de facto fbset 21 * This is a from-scratch implementation of fbset; but the de facto fbset
22 * implementation was a good reference. fbset (original) is released under 22 * implementation was a good reference. fbset (original) is released under
23 * the GPL, and is (c) 1995-1999 by: 23 * the GPL, and is (c) 1995-1999 by:
24 * Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) 24 * Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
25 */ 25 */
26 26
@@ -89,8 +89,8 @@ static const int FBIOPUT_VSCREENINFO = 0x4601;
89struct fb_bitfield { 89struct fb_bitfield {
90 uint32_t offset; /* beginning of bitfield */ 90 uint32_t offset; /* beginning of bitfield */
91 uint32_t length; /* length of bitfield */ 91 uint32_t length; /* length of bitfield */
92 uint32_t msb_right; /* != 0 : Most significant bit is */ 92 uint32_t msb_right; /* != 0 : Most significant bit is */
93 /* right */ 93 /* right */
94}; 94};
95struct fb_var_screeninfo { 95struct fb_var_screeninfo {
96 uint32_t xres; /* visible resolution */ 96 uint32_t xres; /* visible resolution */
@@ -106,7 +106,7 @@ struct fb_var_screeninfo {
106 struct fb_bitfield red; /* bitfield in fb mem if true color, */ 106 struct fb_bitfield red; /* bitfield in fb mem if true color, */
107 struct fb_bitfield green; /* else only length is significant */ 107 struct fb_bitfield green; /* else only length is significant */
108 struct fb_bitfield blue; 108 struct fb_bitfield blue;
109 struct fb_bitfield transp; /* transparency */ 109 struct fb_bitfield transp; /* transparency */
110 110
111 uint32_t nonstd; /* != 0 Non standard pixel format */ 111 uint32_t nonstd; /* != 0 Non standard pixel format */
112 112
@@ -210,13 +210,13 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
210 if ((p = strstr(buf, "geometry "))) { 210 if ((p = strstr(buf, "geometry "))) {
211 p += 9; 211 p += 9;
212 212
213 sscanf(p, "%d %d %d %d %d", 213 sscanf(p, "%d %d %d %d %d",
214 &(base->xres), &(base->yres), 214 &(base->xres), &(base->yres),
215 &(base->xres_virtual), &(base->yres_virtual), 215 &(base->xres_virtual), &(base->yres_virtual),
216 &(base->bits_per_pixel)); 216 &(base->bits_per_pixel));
217 } else if ((p = strstr(buf, "timings "))) { 217 } else if ((p = strstr(buf, "timings "))) {
218 p += 8; 218 p += 8;
219 219
220 sscanf(p, "%d %d %d %d %d %d %d", 220 sscanf(p, "%d %d %d %d %d %d %d",
221 &(base->pixclock), 221 &(base->pixclock),
222 &(base->left_margin), &(base->right_margin), 222 &(base->left_margin), &(base->right_margin),
@@ -271,7 +271,7 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
271 base->sync |= FB_SYNC_EXT; 271 base->sync |= FB_SYNC_EXT;
272 } 272 }
273 } 273 }
274 274
275 if (strstr(buf, "endmode")) 275 if (strstr(buf, "endmode"))
276 return 1; 276 return 1;
277 } 277 }