Changeset 142

Timestamp:

01/03/06 15:08:13 (18 years ago)

Author:

wagi

Message:

2006-01-04 Daniel Wagner <wagi@monom.org>

• tests/test-extplugcmd.cpp: Changed test application
  to use PlugType? and PlugName? command for testing.
  

• src/libfreebobavc/avc_extended_plug_info.cpp (serialize):
  The string.length() thing did not work as expected. A workaround
  added which converts the C++ string into a C string before strlen
  is used.
  

Files:

• trunk/libfreebob/ChangeLog (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_extended_plug_info.cpp (modified) (1 diff)
• trunk/libfreebob/tests/test-extplugcmd.cpp (modified) (12 diffs)
• trunk/libfreebob/TODO (modified) (1 diff)

trunk/libfreebob/ChangeLog

@@ +1 @@
+2006-01-04  Daniel Wagner  <wagi@monom.org>
+
+        * tests/test-extplugcmd.cpp: Changed test application
+        to use PlugType and PlugName command for testing.
+
+        * src/libfreebobavc/avc_extended_plug_info.cpp (serialize): 
+        The string.length() thing did not work as expected. A workaround
+        added which converts the C++ string into a C string before strlen
+        is used.
+
-2006-01-03  Daniel Wagner  <wagi@monom.org>
-

trunk/libfreebob/src/libfreebobavc/avc_extended_plug_info.cpp

@@ -96 +96 @@
-ExtendedPlugInfoPlugNameSpecificData::serialize( IOSSerialize& se )
-{
-
+
+
-              "ExtendedPlugInfoPlugNameSpecificData: string length" );
-m_name.length()
+length
-        se.write( static_cast<byte_t>( m_name[i] ),
-                  "ExtendedPlugInfoPlugNameSpecificData: char" );

trunk/libfreebob/tests/test-extplugcmd.cpp

@@ -1 +1 @@
-/* test-extplugcmd.cpp
-
+,06
- *
- * This file is part of FreeBob.
@@ -26 +26 @@
-#include <argp.h>
-
-
-using namespace std;
-
@@ -32 +31 @@
-// arg parsing
-////////////////////////////////////////////////
-1
+2
-const char *argp_program_bug_address = "<freebob-devel@lists.sf.net>";
-get extended plug info
- PLUG_ID
+tests some extended plug info commands on a BeBoB device
+
-static struct argp_option options[] = {
-
-
+
-    {"port",      'p', "PORT",      0,  "Set port" },
-   { 0 }
@@ -51 +49 @@
-        {
-            args[0] = 0;
-
-
-
-
+
+
+
-    bool  verbose;
-    bool  test;
@@ -85 +82 @@
-        break;
-    case ARGP_KEY_ARG:
-2
+1
-            // Too many arguments.
-            argp_usage (state);
@@ -92 +89 @@
-        break;
-    case ARGP_KEY_END:
-2
+1
-            // Not enough arguments.
-            argp_usage (state);
@@ -104 +101 @@
-
-static struct argp argp = { options, parse_opt, args_doc, doc };
-
-////////////////////////////////////////
-// Test application
-////////////////////////////////////////
-void
-doTest(Ieee1394Service& ieee1394service, int node_id, int plug_id)
-{
-    PlugInfoCmd plugInfoCmd( &ieee1394service );
-    plugInfoCmd.setCommandType( AVCCommand::eCT_Status );
-    plugInfoCmd.setNodeId( node_id );
-    plugInfoCmd.setVerbose( true );
-
-    if ( !plugInfoCmd.fire() ) {
-        return;
-    }
-    return;
-}
-
-////////////////////////////////////////
@@ -127 +107 @@
-
-bool
-App(Ieee1394Service& ieee1394service, int node_id, int plug
+PlugType( Ieee1394Service& ieee1394service, int node
-{
-    ExtendedPlugInfoCmd extPlugInfoCmd( &ieee1394service );
-plug_id
-Out
+0
+In
-                                                PlugAddress::ePAM_Unit,
-                                                unitPlugAddress ) );
@@ -146 +126 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    extendedPlugInfoInfoType.initialize();
-
+
+
-    if ( extPlugInfoCmd.fire() ) {
-        CoutSerializer se;
@@ -154 +165 @@
-    }
-
+    ExtendedPlugInfoInfoType* infoType = extPlugInfoCmd.getInfoType();
+    if ( infoType
+         && infoType->m_plugName )
+    {
+        printf( "iso input plug %d has name '%s'\n",
+                0,
+               infoType->m_plugName->m_name.c_str() );
+    } else {
+        fprintf( stderr, "Not plug name specific data found\n" );
+        return false;
+    }
-
-    return true;
+}
+
+bool
+doApp(Ieee1394Service& ieee1394service, int node_id )
+{
+    bool success;
+
+    success = doPlugType( ieee1394service, node_id );
+    success &= doPlugName( ieee1394service, node_id );
+
+    return success;
-}
-
@@ -174 +207 @@
-        return -1;
-    }
-    int plug_id = strtol(arguments.args[1], &tail, 0);
-    if (errno) {
-        perror("argument parsing failed:");
-        return -1;
-    }
-
-    Ieee1394Service ieee1394service;
-    if ( !ieee1394service.initialize( arguments.port ) ) {
@@ -186 +213 @@
-    }
-
-
-
-
-
-
+
-
-    return 0;

trunk/libfreebob/TODO

@@ -6 +6 @@
-  the DebugModule's methods. The idea is to have a more consistant
-  code.
+- All libfreebobavc interfaces should use references instead of pointers
+  like in  ExtendedPlugInfoCmd( Ieee1394Service* ieee1394service, ... )
+  ->  ExtendedPlugInfoCmd( Ieee1394Service& ieee1394service,