Changeset 1603

Timestamp:

07/23/09 04:12:27 (14 years ago)

Author:

jwoithe

Message:

Restore scan-devreg functionality accidently removed in revision 1550.

Files:

• trunk/libffado/tests/scan-devreg.cpp (modified) (8 diffs)

trunk/libffado/tests/scan-devreg.cpp

@@ -44 +44 @@
-#define MAX_ARGS 1000
-
-
-
+
-// If changing these be sure to update the option help text
-#define DEFAULT_SCAN_START_REG 0x0b00
@@ -84 +83 @@
-    signed int   verbose;
-    bool         test;
-          
-          
-long long 
-long long 
+
+
+
+
-} arguments;
-
@@ -113 +112 @@
-    case 's':
-        errno = 0;
-l
+
-        if (errno) {
-            perror("argument parsing failed:");
@@ -125 +124 @@
-    case 'l':
-        errno = 0;
-l
+
-        if (errno) {
-            perror("argument parsing failed:");
@@ -232 +231 @@
-            // only MOTU devices but this can be expanded on an as-needs
-            // basis.
-
-
+
-                node_id = node;
-                port = i;
@@ -263 +261 @@
-
-    quadlet_t old_vals[arguments.scan_length/4+1], quadlet;
-4
+(4*32)
-    memset(old_vals, 0x00, sizeof(old_vals));
-    // Assume all registers are present until proven otherwise
-    memset(present, 0xff, sizeof(present));
-    
-ll
+
-           SCAN_BASE_ADDR + arguments.scan_start,
-           SCAN_BASE_ADDR + arguments.scan_start + arguments.scan_length,
@@ -275 +273 @@
-    chr[0] = 0;
-    while(chr[0]!='q') {
-long long 
+
-             reg < arguments.scan_start + arguments.scan_length; reg+=4) {
-
-
-
+
+
+
+
+
-                continue;
-            }
@@ -285 +285 @@
-            if (m_1394Service->read(0xffc0 | node_id, SCAN_BASE_ADDR+reg, 1, &quadlet) <= 0) {
-                // Flag the register as not being present so we don't keep trying to read it
-reg_index] = 0
-
+pres_index] &= ~(1<<pres_bit)
+// 
-                continue;
-            } else {
-                quadlet = CondSwapFromBus32(quadlet);
-                char bitvector[33];
-                bitvector[32] = 0;
-                for (int i=0; i<32; i++) {
-                    if (quadlet & (1<<(31-i))) {
-                        bitvector[i] = '1';
-                    } else {
-                        bitvector[i] = '0';
-                    }
-                }
-                char bitvector_spaced[33+7];
-                bitvector_spaced[32+7] = 0;
-                int cnt=0;
-                for (int i=0; i<32; i++) {
-                    if (i % 4 == 0 && i) {
-                        bitvector_spaced[cnt] = ' ';
-                        cnt++;
-                    }
-                    bitvector_spaced[cnt] = bitvector[i];
-                    cnt++;
-                }
-                printf("Register [%06lld] %012llX: %08X [%10u] [%s] [%10d %10d]\n", 
-                       (reg-arguments.scan_start)/4, SCAN_BASE_ADDR+reg, 
-                       quadlet, quadlet, 
-                       bitvector_spaced,
-                       (quadlet>>16) & 0xFFFF, quadlet & 0xFFFF);
-            }
-
-            if (old_vals[reg_index] != quadlet) {
-                if (loop != 0) {
-12llx changed from %08X to %08X\n", SCAN_BASE_ADDR+
+4x changed from %08X to %08X\n", 
-                }
-                old_vals[reg_index] = quadlet;