@@ -72,6 +72,12 @@ int test_eos_t6() {
7272 int rc = test_setup_usb (& r );
7373 if (rc ) return rc ;
7474
75+ rc = ptp_get_device_info (& r , & di );
76+ if (rc ) return rc ;
77+ char buffer [2048 ];
78+ ptp_device_info_json (& di , buffer , sizeof (buffer ));
79+ printf ("%s\n" , buffer );
80+
7581 if (ptp_device_type (& r ) == PTP_DEV_EOS ) {
7682 ptp_eos_set_remote_mode (& r , 1 );
7783 ptp_eos_set_event_mode (& r , 1 );
@@ -83,13 +89,7 @@ int test_eos_t6() {
8389 char events_json [4096 ];
8490 ptp_eos_events_json (& r , events_json , sizeof (events_json ));
8591
86- puts (events_json );
87-
88- rc = ptp_get_device_info (& r , & di );
89- if (rc ) return rc ;
90- char buffer [2048 ];
91- ptp_device_info_json (& di , buffer , sizeof (buffer ));
92- printf ("%s\n" , buffer );
92+ printf ("Events: %s\n" , events_json );
9393
9494 assert (!strcmp (di .manufacturer , "Canon Inc." ));
9595 assert (!strcmp (di .extensions , "G-V: 1.0;" ));
@@ -273,29 +273,29 @@ static int test_multithread() {
273273int main () {
274274 int rc ;
275275
276- // rc = test_multithread();
277- // printf("Return code: %d\n", rc);
278- // if (rc) return rc;
279- //
280- // rc = test_eos_t6();
281- // printf("Return code: %d\n", rc);
282- // if (rc) return rc;
283- //
284- // rc = test_bind();
285- // printf("Return code: %d\n", rc);
286- // if (rc) return rc;
276+ rc = test_multithread ();
277+ printf ("Return code: %d\n" , rc );
278+ if (rc ) return rc ;
279+
280+ rc = test_eos_t6 ();
281+ printf ("Return code: %d\n" , rc );
282+ if (rc ) return rc ;
283+
284+ rc = test_bind ();
285+ printf ("Return code: %d\n" , rc );
286+ if (rc ) return rc ;
287287
288288 rc = test_fs ();
289289 printf ("Return code: %d\n" , rc );
290290 if (rc ) return rc ;
291291
292- // rc = ptp_vcam_magic();
293- // printf("Return code: %d\n", rc);
294- // if (rc) return rc;
295- //
296- // rc = test_props();
297- // printf("Return code: %d\n", rc);
298- // if (rc) return rc;
292+ rc = ptp_vcam_magic ();
293+ printf ("Return code: %d\n" , rc );
294+ if (rc ) return rc ;
295+
296+ rc = test_props ();
297+ printf ("Return code: %d\n" , rc );
298+ if (rc ) return rc ;
299299
300300 return 0 ;
301301}
0 commit comments