Changeset 4955:5a13f6cdde6e in roaraudio

Timestamp:

05/13/11 17:51:25 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

patch to add support to list drivers in diffrent formats

Location:

roard

Files:

• Makefile (modified) (1 diff)
• driver.c (modified) (2 diffs)
• include/driver.h (modified) (1 diff)
• include/roard.h (modified) (2 diffs)
• roard.c (modified) (3 diffs)

roard/Makefile

@@ -34 +34 @@
 new: clean all
 
+run: roard
+        ./roard $(ARGS)
+
 roard: ${OBJ} ${SUBSYS} ${DRV} ${CF} ${EMUL} ${HWMIXER}
         ${CC} ${LDFLAGS} -o roard ${OBJ} ${SUBSYS} ${DRV} ${CF} ${EMUL} ${HWMIXER} ${LIBS}

roard/driver.c

@@ -113 +113 @@
                                 };
 
-void print_driverlist (void) {
+void print_driverlist (enum output_format format) {
  int i;
  char subsys[7] = "      ";
  char mode[5]   = "    ";
 
- printf("  Driver       Mode Flag Subsys - Description (devices)\n");
- printf("---------------------------------------------------------------\n");
+ switch (format) {
+  case FORMAT_NATIVE:
+    printf("  Driver       Mode Flag Subsys - Description (devices)\n");
+    printf("---------------------------------------------------------------\n");
+   break;
+  case FORMAT_WIKI:
+    printf("||=Driver =||=Mode =||=Flag =||=Subsys =||=Description =||=Devices\n");
+   break;
+  case FORMAT_CSV:
+    printf("Driver,Mode,Flag,Subsys,Description,Devices\n");
+   break;
+  default:
+    roar_err_set(ROAR_ERROR_NOTSUP);
+    return;
+ }
 
  for (i = 0; g_driver[i].name != NULL; i++) {
@@ -143 +156 @@
    subsys[5] = 'X';
 
-  if ( g_driver[i].devices != NULL ) {
-   printf("  %-12s %4s %c%c%c%c %6s - %s (devices: %s)\n", g_driver[i].name,
-                 mode,
-                 ' ', /* unused Flag */
-                 g_driver[i].flags & DRV_FLAG_FHSEC                                                         ? 's' : ' ',
-                 g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'S' : ' ',
-                 g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'V' : ' ',
-                 subsys,
-                 g_driver[i].desc, g_driver[i].devices);
-  } else {
-   printf("  %-12s %4s %c%c%c%c %6s - %s\n", g_driver[i].name,
-                 mode,
-                 ' ', /* unused Flag */
-                 g_driver[i].flags & DRV_FLAG_FHSEC                                                         ? 's' : ' ',
-                 g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'S' : ' ',
-                 g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'V' : ' ',
-                 subsys,
-                 g_driver[i].desc);
+  switch (format) {
+   case FORMAT_NATIVE:
+     if ( g_driver[i].devices != NULL ) {
+      printf("  %-12s %4s %c%c%c%c %6s - %s (devices: %s)\n", g_driver[i].name,
+                    mode,
+                    ' ', /* unused Flag */
+                    g_driver[i].flags & DRV_FLAG_FHSEC                                                         ? 's' : ' ',
+                    g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'S' : ' ',
+                    g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'V' : ' ',
+                    subsys,
+                    g_driver[i].desc, g_driver[i].devices);
+     } else {
+      printf("  %-12s %4s %c%c%c%c %6s - %s\n", g_driver[i].name,
+                    mode,
+                    ' ', /* unused Flag */
+                    g_driver[i].flags & DRV_FLAG_FHSEC                                                         ? 's' : ' ',
+                    g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'S' : ' ',
+                    g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'V' : ' ',
+                    subsys,
+                    g_driver[i].desc);
+     }
+    break;
+   case FORMAT_WIKI:
+     printf("||=%-12s =|| %s || %s%s%s ||%s ||%s ||%s ||\n", g_driver[i].name, mode[0] == ' ' ? mode+1 : mode,
+                    g_driver[i].flags & DRV_FLAG_FHSEC                                                         ? "s" : " ",
+                    g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? "S" : " ",
+                    g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? "V" : " ",
+                    subsys,
+                    g_driver[i].desc, g_driver[i].devices == NULL ? "" : g_driver[i].devices);
+    break;
+   case FORMAT_CSV:
+     printf("%s,%s,%s%s%s,%s,%s,%s\n", g_driver[i].name, mode,
+                    g_driver[i].flags & DRV_FLAG_FHSEC                                                         ? "s" : " ",
+                    g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? "S" : " ",
+                    g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? "V" : " ",
+                    subsys,
+                    g_driver[i].desc, g_driver[i].devices == NULL ? "" : g_driver[i].devices);
+    break;
   }
  }

roard/include/driver.h

@@ -173 +173 @@
 };
 
-void print_driverlist (void);
+void print_driverlist (enum output_format format);
 
 int driver_openvio(struct roar_vio_calls * calls,

roard/include/roard.h

@@ -92 +92 @@
  int    si;
 };
+
+enum output_format;
 
 // MFOI = Marked For Optional Include
@@ -215 +217 @@
 
 
+enum output_format {
+ FORMAT_NATIVE = 1,
+ FORMAT_WIKI,
+ FORMAT_CSV,
+
+ FORMAT_DEFAULT = FORMAT_NATIVE
+};
+
 #define counters_init() memset(&g_counters, 0, sizeof(g_counters))
 //#define counters_inc(c,i) do { signed long int __i = (i); if ( __i < 0 && __i > (g_counters.cur.c) ) { ROAR_WARN("counters_inc(c=%s, i=%li): Decrement request bigger than current counter value. Counter out of syn!", )  } while (0)

roard/roard.c

@@ -1332 +1332 @@
  int i;
  char * k;
+ enum output_format print_format = FORMAT_NATIVE;
 #endif
 #if defined(ROAR_SUPPORT_LISTEN) && defined(ROAR_HAVE_GETUID)
@@ -1590 +1591 @@
    ROAR_ERR("--daemon not supported");
 #endif
-  } else if ( strcmp(k, "--verbose") == 0 ) {
+  } else if ( strcmp(k, "--print-format") == 0 ) {
    g_verbose++;
+   k = argv[++i];
+   if ( !strcasecmp(k, "native") ) {
+    print_format = FORMAT_NATIVE;
+   } else if ( !strcasecmp(k, "wiki") ) {
+    print_format = FORMAT_WIKI;
+   } else if ( !strcasecmp(k, "csv") ) {
+    print_format = FORMAT_CSV;
+   } else {
+    ROAR_WARN("Unknown print format: %s", k);
+   }
+
+  } else if ( strcmp(k, "--print-format") == 0 ) {
+   _CKHAVEARGS(1);
+
   } else if ( strcmp(k, "--terminate") == 0 ) {
    g_terminate = 1;
@@ -1740 +1755 @@
 
   } else if ( strcmp(k, "--list-driver") == 0 ) {
-   print_driverlist();
+   print_driverlist(print_format);
    return 0;