Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/fbset.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/fbset.c (modified) (7 diffs)

branches/3.2/mindi-busybox/util-linux/fbset.c

@@ -12 +12 @@
  *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
  */
+
+//usage:#define fbset_trivial_usage
+//usage:       "[OPTIONS] [MODE]"
+//usage:#define fbset_full_usage "\n\n"
+//usage:       "Show and modify frame buffer settings"
+//usage:
+//usage:#define fbset_example_usage
+//usage:       "$ fbset\n"
+//usage:       "mode \"1024x768-76\"\n"
+//usage:       "    # D: 78.653 MHz, H: 59.949 kHz, V: 75.694 Hz\n"
+//usage:       "    geometry 1024 768 1024 768 16\n"
+//usage:       "    timings 12714 128 32 16 4 128 4\n"
+//usage:       "    accel false\n"
+//usage:       "    rgba 5/11,6/5,5/0,0/0\n"
+//usage:       "endmode\n"
 
 #include "libbb.h"
@@ -257 +272 @@
         p = token[1];
         i = index_in_strings(
-            "geometry\0timings\0interlaced\0double\0vsync\0hsync\0csync\0extsync\0",
+            "geometry\0timings\0interlaced\0double\0vsync\0hsync\0csync\0extsync\0rgba\0",
             token[0]);
         switch (i) {
@@ -328 +343 @@
 //bb_info_msg("EXTSYNC[%s]", p);
             break;
+        case 8: {
+            int red_offset, red_length;
+            int green_offset, green_length;
+            int blue_offset, blue_length;
+            int transp_offset, transp_length;
+
+            sscanf(p, "%d/%d,%d/%d,%d/%d,%d/%d",
+                &red_offset, &red_length,
+                &green_offset, &green_length,
+                &blue_offset, &blue_length,
+                &transp_offset, &transp_length);
+            base->red.offset = red_offset;
+            base->red.length = red_length;
+            base->red.msb_right = 0;
+            base->green.offset = green_offset;
+            base->green.length = green_length;
+            base->green.msb_right = 0;
+            base->blue.offset = blue_offset;
+            base->blue.length = blue_length;
+            base->blue.msb_right = 0;
+            base->transp.offset = transp_offset;
+            base->transp.length = transp_length;
+            base->transp.msb_right = 0;
+        }
         }
     }
@@ -371 +410 @@
         OPT_SHOW     = (1 << 1),
         OPT_READMODE = (1 << 2),
-        OPT_ALL      = (1 << 9),
+        OPT_ALL      = (1 << 3),
     };
     struct fb_var_screeninfo var_old, var_set;
@@ -388 +427 @@
     argc--;
     for (; argc > 0 && (thisarg = *argv) != NULL; argc--, argv++) {
-        if (thisarg[0] == '-') for (i = 0; i < ARRAY_SIZE(g_cmdoptions); i++) {
+        if (thisarg[0] != '-') {
+            if (!ENABLE_FEATURE_FBSET_READMODE || argc != 1)
+                bb_show_usage();
+            mode = thisarg;
+            options |= OPT_READMODE;
+            goto contin;
+        }
+        for (i = 0; i < ARRAY_SIZE(g_cmdoptions); i++) {
             if (strcmp(thisarg + 1, g_cmdoptions[i].name) != 0)
                 continue;
@@ -457 +503 @@
             goto contin;
         }
-        if (!ENABLE_FEATURE_FBSET_READMODE || argc != 1)
-            bb_show_usage();
-        mode = *argv;
-        options |= OPT_READMODE;
+        bb_show_usage();
  contin: ;
     }
@@ -472 +515 @@
             bb_error_msg_and_die("unknown video mode '%s'", mode);
         }
+        options |= OPT_CHANGE;
 #endif
     }