Changeset 7770cc5dee8fe34e69492da723b75e024d9c3e90

Timestamp:

11/04/09 01:51:33 (3 years ago)

Author:

Pierre-Alexandre Meyer <pierre@…>

Children:

494fa55b2fe19660464b008af12694f2448512f1

Parents:

4c87c3409e1788191541cc1e4897bc38f5fe02c6, 291f0542a26110868069d9f92d7d71c9974e28ff

git-committer:

Pierre-Alexandre Meyer <pierre@mouraf.org> / 2009-11-03T17:51:33Z-0800

Message:

Merge commit 'hdt-0.3.5-pre2' into hdt-0.3.5

Location:

com32

Files:

• hdt/hdt-cli-hdt.c (modified) (2 diffs)
• hdt/hdt-cli.h (modified) (1 diff)
• hdt/hdt-common.c (modified) (2 diffs)
• hdt/hdt-common.h (modified) (1 diff)
• hdt/hdt-menu-about.c (modified) (2 diffs)
• hdt/hdt-menu.c (modified) (1 diff)
• hdt/hdt.c (modified) (1 diff)
• hdt/hdt.h (modified) (1 diff)
• include/libansi.h (modified) (1 diff)
• lib/sys/libansi.c (modified) (3 diffs)

com32/hdt/hdt-cli-hdt.c

@@ -194 +194 @@
 {
         char version_string[256];
-        snprintf(version_string, sizeof version_string, "%s %s",
-                 PRODUCT_NAME, VERSION);
+        snprintf(version_string, sizeof version_string, "%s %s (%s)",
+                 PRODUCT_NAME, VERSION, CODENAME);
         start_menu_mode(hardware, version_string);
         return;
@@ -242 +242 @@
     reset_more_printf();
         more_printf("HDT\n");
-        more_printf(" Product     : %s\n", PRODUCT_NAME);
-        more_printf(" Version     : %s\n", VERSION);
-        more_printf(" Author      : %s\n", AUTHOR);
-        more_printf(" Contact     : %s\n", CONTACT);
+        more_printf(" Product        : %s\n", PRODUCT_NAME);
+        more_printf(" Version        : %s (%s)\n", VERSION, CODENAME);
+        more_printf(" Project Leader : %s\n", AUTHOR);
+        more_printf(" Contact        : %s\n", CONTACT);
+        more_printf(" Core Developer : %s\n", CORE_DEVELOPER);
         char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS;
         for (int c = 0; c < NB_CONTRIBUTORS; c++) {
-                more_printf(" Contributor : %s\n", contributors[c]);
+                more_printf(" Contributor    : %s\n", contributors[c]);
         }
 }

com32/hdt/hdt-cli.h

@@ -49 +49 @@
 #define CLI_EXIT "exit"
 #define CLI_HELP "help"
+#define CLI_REBOOT "reboot"
 #define CLI_SHOW "show"
 #define CLI_SET "set"

com32/hdt/hdt-common.c

@@ -73 +73 @@
         sizeof(hardware->memtest_label));
       convert_isolinux_filename(hardware->memtest_label,hardware);
+    } else if (!strncmp(argv[i], "reboot=", 7)) {
+      strncpy(hardware->reboot_label, argv[i] + 7,
+        sizeof(hardware->reboot_label));
+      convert_isolinux_filename(hardware->reboot_label,hardware);
     }
   }
@@ -134 +138 @@
          sizeof hardware->modules_alias_path);
   memset(hardware->memtest_label, 0, sizeof hardware->memtest_label);
+  memset(hardware->reboot_label, 0, sizeof hardware->reboot_label);
   strcat(hardware->pciids_path, "pci.ids");
   strcat(hardware->modules_pcimap_path, "modules.pcimap");
   strcat(hardware->modules_alias_path, "modules.alias");
   strcat(hardware->memtest_label, "memtest");
+  strcat(hardware->reboot_label, "reboot.c32");
 }
 

com32/hdt/hdt-common.h

@@ -163 +163 @@
   char pciids_path[255];
   char memtest_label[255];
+  char reboot_label[255];
 };
 

com32/hdt/hdt-menu-about.c

@@ -40 +40 @@
   set_menu_pos(SUBMENU_Y, SUBMENU_X);
 
-  snprintf(buffer, sizeof buffer, "Product     : %s", PRODUCT_NAME);
+  snprintf(buffer, sizeof buffer, "Product        : %s", PRODUCT_NAME);
   snprintf(statbuffer, sizeof statbuffer, "Product : %s", PRODUCT_NAME);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
 
-  snprintf(buffer, sizeof buffer, "Version     : %s", VERSION);
-  snprintf(statbuffer, sizeof statbuffer, "Version : %s", VERSION);
+  snprintf(buffer, sizeof buffer, "Version        : %s (%s)", VERSION, CODENAME);
+  snprintf(statbuffer, sizeof statbuffer, "Version : %s (%s)", VERSION,CODENAME);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
 
-  snprintf(buffer, sizeof buffer, "Author      : %s", AUTHOR);
-  snprintf(statbuffer, sizeof statbuffer, "Author  : %s", AUTHOR);
+  snprintf(buffer, sizeof buffer, "Project Leader : %s", AUTHOR);
+  snprintf(statbuffer, sizeof statbuffer, "Project Leader  : %s", AUTHOR);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
 
-  snprintf(buffer, sizeof buffer, "Contact     : %s", CONTACT);
+  snprintf(buffer, sizeof buffer, "Contact        : %s", CONTACT);
   snprintf(statbuffer, sizeof statbuffer, "Contact : %s", CONTACT);
+  add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
+  menu->items_count++;
+
+  snprintf(buffer, sizeof buffer, "Core Developer : %s", CORE_DEVELOPER);
+  snprintf(statbuffer, sizeof statbuffer, "Core Developer  : %s", CORE_DEVELOPER);
   add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);
   menu->items_count++;
@@ -62 +67 @@
   char *contributors[NB_CONTRIBUTORS] = CONTRIBUTORS;
   for (int c=0; c<NB_CONTRIBUTORS; c++) {
-   snprintf(buffer, sizeof buffer, "Contributor : %s", contributors[c]);
+   snprintf(buffer, sizeof buffer, "Contributor    : %s", contributors[c]);
    snprintf(statbuffer, sizeof statbuffer, "Contributor : %s", contributors[c]);
    add_item(buffer, statbuffer, OPT_INACTIVE, NULL, 0);

com32/hdt/hdt-menu.c

@@ -293 +293 @@
   add_item("<A>bout", "About Menu", OPT_SUBMENU, NULL,
      hdt_menu->about_menu.menu);
+  add_item("<R>eboot", "Reboot", OPT_RUN, hardware->reboot_label, 0);
   add_item("E<x>it","Exit", OPT_EXITMENU,NULL,0);
   hdt_menu->main_menu.items_count++;

com32/hdt/hdt.c

@@ -49 +49 @@
   struct s_hardware hardware;
 
-  snprintf(version_string, sizeof version_string, "%s %s",
-           PRODUCT_NAME,VERSION);
+  snprintf(version_string, sizeof version_string, "%s %s (%s)",
+           PRODUCT_NAME,VERSION, CODENAME);
 
   /* Opening the Syslinux console */

com32/hdt/hdt.h

@@ -32 +32 @@
 #define PRODUCT_NAME "Hardware Detection Tool"
 #define AUTHOR "Erwan Velu"
+#define CORE_DEVELOPER "Pierre-Alexandre Meyer"
 #define CONTACT "hdt@zytor.com"
-#define VERSION "0.3.5-pre1"
-#define NB_CONTRIBUTORS 3
-#define CONTRIBUTORS {"Pierre-Alexandre Meyer", "Sebastien Gonzalve", "Gert Hulselmans"}
+#define VERSION "0.3.5-pre2"
+#define CODENAME "mojito"
+#define NB_CONTRIBUTORS 2 
+#define CONTRIBUTORS {"Sebastien Gonzalve", "Gert Hulselmans"}
 
 #define ATTR_PACKED __attribute__((packed))

com32/include/libansi.h

@@ -72 +72 @@
 }
 
-/*
- * cls - clear and initialize the entire screen
- *
- * Note: when initializing xterm, one has to specify that
- * G1 points to the alternate character set (this is not true
- * by default). Without the initial printf "\033)0", line drawing
- * characters won't be displayed.
- */
-static inline void cls(void)
-{
-        fputs("\033e\033%@\033)0\033(B\1#0\033[?25l\033[2J", stdout);
-}
+void cls(void);
 
 static inline void cursoroff(void)

com32/lib/sys/libansi.c

@@ -114 +114 @@
  * Convert the VGA attribute @attr to an ANSI escape sequence and
  * print it.
+ * For performance, SGR parameters are cached. To reset them,
+ * call cprint_vga2ansi('0', '0').
  **/
 static void cprint_vga2ansi(const char chr, const char attr)
@@ -120 +122 @@
         static uint16_t last_attr = 0x300;
         char buf[16], *p;
+
+    if (chr == '0' && attr == '0') {
+        last_attr = 0x300;
+        return;
+    }
 
         if (attr != last_attr) {
@@ -164 +171 @@
 }
 
+/*
+ * cls - clear and initialize the entire screen
+ *
+ * Note: when initializing xterm, one has to specify that
+ * G1 points to the alternate character set (this is not true
+ * by default). Without the initial printf "\033)0", line drawing
+ * characters won't be displayed.
+ */
+void cls(void)
+{
+        fputs("\033e\033%@\033)0\033(B\1#0\033[?25l\033[2J", stdout);
+
+    /* Reset SGR parameters cache */
+    cprint_vga2ansi('0', '0');
+}
+
 void reset_colors()
 {