1 files changed, 68 insertions, 68 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 83bf309a3..b1118311f 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -52,7 +52,7 @@ enum {
        CMD_VSYNC = 7,
        CMD_LACED = 8,
        CMD_DOUBLE = 9,
-/*      CMD_XCOMPAT =     10, */
+/*      CMD_XCOMPAT =     10, */
        CMD_ALL = 11,
        CMD_INFO = 12,
        CMD_CHANGE = 13,
@@ -207,70 +207,70 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
                                while (!feof(f)) {
                                        fgets(buf, sizeof(buf), f);
-                    if ((p = strstr(buf, "geometry "))) {
+                    if ((p = strstr(buf, "geometry "))) {
-                        p += 9;
+                        p += 9;
-                        sscanf(p, "%d %d %d %d %d",
+                        sscanf(p, "%d %d %d %d %d",
-                                &(base->xres), &(base->yres),
+                                &(base->xres), &(base->yres),
-                                &(base->xres_virtual), &(base->yres_virtual),
+                                &(base->xres_virtual), &(base->yres_virtual),
-                                &(base->bits_per_pixel));
+                                &(base->bits_per_pixel));
-                    } else if ((p = strstr(buf, "timings "))) {
+                    } else if ((p = strstr(buf, "timings "))) {
-                        p += 8;
+                        p += 8;
-    
-                        sscanf(p, "%d %d %d %d %d %d %d",
+                        sscanf(p, "%d %d %d %d %d %d %d",
-                                &(base->pixclock),
+                                &(base->pixclock),
-                                &(base->left_margin), &(base->right_margin),
+                                &(base->left_margin), &(base->right_margin),
-                                &(base->upper_margin), &(base->lower_margin),
+                                &(base->upper_margin), &(base->lower_margin),
-                                &(base->hsync_len), &(base->vsync_len));
+                                &(base->hsync_len), &(base->vsync_len));
-                    } else if ((p = strstr(buf, "laced "))) {
+                    } else if ((p = strstr(buf, "laced "))) {
-                        p += 6;
+                        p += 6;
-                        if (strstr(buf, "false")) {
+                        if (strstr(buf, "false")) {
-                            base->vmode &= ~FB_VMODE_INTERLACED;
+                            base->vmode &= ~FB_VMODE_INTERLACED;
-                        } else {
+                        } else {
-                            base->vmode |= FB_VMODE_INTERLACED;
+                            base->vmode |= FB_VMODE_INTERLACED;
-                        }
+                        }
-                    } else if ((p = strstr(buf, "double "))) {
+                    } else if ((p = strstr(buf, "double "))) {
-                        p += 7;
+                        p += 7;
-                        if (strstr(buf, "false")) {
+                        if (strstr(buf, "false")) {
-                            base->vmode &= ~FB_VMODE_DOUBLE;
+                            base->vmode &= ~FB_VMODE_DOUBLE;
-                        } else {
+                        } else {
-                            base->vmode |= FB_VMODE_DOUBLE;
+                            base->vmode |= FB_VMODE_DOUBLE;
-                        }
+                        }
-                    } else if ((p = strstr(buf, "vsync "))) {
+                    } else if ((p = strstr(buf, "vsync "))) {
-                        p += 6;
+                        p += 6;
-                        if (strstr(buf, "low")) {
+                        if (strstr(buf, "low")) {
-                            base->sync &= ~FB_SYNC_VERT_HIGH_ACT;
+                            base->sync &= ~FB_SYNC_VERT_HIGH_ACT;
-                        } else {
+                        } else {
-                            base->sync |= FB_SYNC_VERT_HIGH_ACT;
+                            base->sync |= FB_SYNC_VERT_HIGH_ACT;
-                        }
+                        }
-                    } else if ((p = strstr(buf, "hsync "))) {
+                    } else if ((p = strstr(buf, "hsync "))) {
-                        p += 6;
+                        p += 6;
-                        if (strstr(buf, "low")) {
+                        if (strstr(buf, "low")) {
-                            base->sync &= ~FB_SYNC_HOR_HIGH_ACT;
+                            base->sync &= ~FB_SYNC_HOR_HIGH_ACT;
-                        } else {
+                        } else {
-                            base->sync |= FB_SYNC_HOR_HIGH_ACT;
+                            base->sync |= FB_SYNC_HOR_HIGH_ACT;
-                        }
+                        }
-                    } else if ((p = strstr(buf, "csync "))) {
+                    } else if ((p = strstr(buf, "csync "))) {
-                        p += 6;
+                        p += 6;
-                        if (strstr(buf, "low")) {
+                        if (strstr(buf, "low")) {
-                            base->sync &= ~FB_SYNC_COMP_HIGH_ACT;
+                            base->sync &= ~FB_SYNC_COMP_HIGH_ACT;
-                        } else {
+                        } else {
-                            base->sync |= FB_SYNC_COMP_HIGH_ACT;
+                            base->sync |= FB_SYNC_COMP_HIGH_ACT;
-                        }
+                        }
-                    } else if ((p = strstr(buf, "extsync "))) {
+                    } else if ((p = strstr(buf, "extsync "))) {
-                        p += 8;
+                        p += 8;
-                        if (strstr(buf, "false")) {
+                        if (strstr(buf, "false")) {
-                            base->sync &= ~FB_SYNC_EXT;
+                            base->sync &= ~FB_SYNC_EXT;
-                        } else {
+                        } else {
-                            base->sync |= FB_SYNC_EXT;
+                            base->sync |= FB_SYNC_EXT;
-                        }
+                        }
-                    }
+                    }
                                        if (strstr(buf, "endmode"))
                                                return 1;
@@ -374,9 +374,9 @@ extern int fbset_main(int argc, char **argv)
                                        varset.hsync_len = strtoul(argv[6], 0, 0);
                                        varset.vsync_len = strtoul(argv[7], 0, 0);
                                        break;
-                case CMD_CHANGE:
+                case CMD_CHANGE:
-                    g_options |= OPT_CHANGE;
+                    g_options |= OPT_CHANGE;
-                    break;
+                    break;
 #ifdef CONFIG_FEATURE_FBSET_FANCY
                                case CMD_XRES:
                                        varset.xres = strtoul(argv[1], 0, 0);

diff --git a/util-linux/fbset.c b/util-linux/fbset.c index 83bf309a3..b1118311f 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c
@@ -52,7 +52,7 @@ enum {
52	CMD_VSYNC = 7,	52	CMD_VSYNC = 7,
53	CMD_LACED = 8,	53	CMD_LACED = 8,
54	CMD_DOUBLE = 9,	54	CMD_DOUBLE = 9,
55	/* CMD_XCOMPAT = 10, */	55	/* CMD_XCOMPAT = 10, */
56	CMD_ALL = 11,	56	CMD_ALL = 11,
57	CMD_INFO = 12,	57	CMD_INFO = 12,
58	CMD_CHANGE = 13,	58	CMD_CHANGE = 13,
@@ -207,70 +207,70 @@ static int readmode(struct fb_var_screeninfo base, const char fn,
207	while (!feof(f)) {	207	while (!feof(f)) {
208	fgets(buf, sizeof(buf), f);	208	fgets(buf, sizeof(buf), f);
209		209
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),
223	&(base->upper_margin), &(base->lower_margin),	223	&(base->upper_margin), &(base->lower_margin),
224	&(base->hsync_len), &(base->vsync_len));	224	&(base->hsync_len), &(base->vsync_len));
225	} else if ((p = strstr(buf, "laced "))) {	225	} else if ((p = strstr(buf, "laced "))) {
226	p += 6;	226	p += 6;
227		227
228	if (strstr(buf, "false")) {	228	if (strstr(buf, "false")) {
229	base->vmode &= ~FB_VMODE_INTERLACED;	229	base->vmode &= ~FB_VMODE_INTERLACED;
230	} else {	230	} else {
231	base->vmode \|= FB_VMODE_INTERLACED;	231	base->vmode \|= FB_VMODE_INTERLACED;
232	}	232	}
233	} else if ((p = strstr(buf, "double "))) {	233	} else if ((p = strstr(buf, "double "))) {
234	p += 7;	234	p += 7;
235		235
236	if (strstr(buf, "false")) {	236	if (strstr(buf, "false")) {
237	base->vmode &= ~FB_VMODE_DOUBLE;	237	base->vmode &= ~FB_VMODE_DOUBLE;
238	} else {	238	} else {
239	base->vmode \|= FB_VMODE_DOUBLE;	239	base->vmode \|= FB_VMODE_DOUBLE;
240	}	240	}
241	} else if ((p = strstr(buf, "vsync "))) {	241	} else if ((p = strstr(buf, "vsync "))) {
242	p += 6;	242	p += 6;
243		243
244	if (strstr(buf, "low")) {	244	if (strstr(buf, "low")) {
245	base->sync &= ~FB_SYNC_VERT_HIGH_ACT;	245	base->sync &= ~FB_SYNC_VERT_HIGH_ACT;
246	} else {	246	} else {
247	base->sync \|= FB_SYNC_VERT_HIGH_ACT;	247	base->sync \|= FB_SYNC_VERT_HIGH_ACT;
248	}	248	}
249	} else if ((p = strstr(buf, "hsync "))) {	249	} else if ((p = strstr(buf, "hsync "))) {
250	p += 6;	250	p += 6;
251		251
252	if (strstr(buf, "low")) {	252	if (strstr(buf, "low")) {
253	base->sync &= ~FB_SYNC_HOR_HIGH_ACT;	253	base->sync &= ~FB_SYNC_HOR_HIGH_ACT;
254	} else {	254	} else {
255	base->sync \|= FB_SYNC_HOR_HIGH_ACT;	255	base->sync \|= FB_SYNC_HOR_HIGH_ACT;
256	}	256	}
257	} else if ((p = strstr(buf, "csync "))) {	257	} else if ((p = strstr(buf, "csync "))) {
258	p += 6;	258	p += 6;
259		259
260	if (strstr(buf, "low")) {	260	if (strstr(buf, "low")) {
261	base->sync &= ~FB_SYNC_COMP_HIGH_ACT;	261	base->sync &= ~FB_SYNC_COMP_HIGH_ACT;
262	} else {	262	} else {
263	base->sync \|= FB_SYNC_COMP_HIGH_ACT;	263	base->sync \|= FB_SYNC_COMP_HIGH_ACT;
264	}	264	}
265	} else if ((p = strstr(buf, "extsync "))) {	265	} else if ((p = strstr(buf, "extsync "))) {
266	p += 8;	266	p += 8;
267		267
268	if (strstr(buf, "false")) {	268	if (strstr(buf, "false")) {
269	base->sync &= ~FB_SYNC_EXT;	269	base->sync &= ~FB_SYNC_EXT;
270	} else {	270	} else {
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;
@@ -374,9 +374,9 @@ extern int fbset_main(int argc, char **argv)
374	varset.hsync_len = strtoul(argv[6], 0, 0);	374	varset.hsync_len = strtoul(argv[6], 0, 0);
375	varset.vsync_len = strtoul(argv[7], 0, 0);	375	varset.vsync_len = strtoul(argv[7], 0, 0);
376	break;	376	break;
377	case CMD_CHANGE:	377	case CMD_CHANGE:
378	g_options \|= OPT_CHANGE;	378	g_options \|= OPT_CHANGE;
379	break;	379	break;
380	#ifdef CONFIG_FEATURE_FBSET_FANCY	380	#ifdef CONFIG_FEATURE_FBSET_FANCY
381	case CMD_XRES:	381	case CMD_XRES:
382	varset.xres = strtoul(argv[1], 0, 0);	382	varset.xres = strtoul(argv[1], 0, 0);