Changeset 962
- Timestamp:
- 03/19/08 05:55:31 (16 years ago)
- Files:
-
- trunk/libffado/external/dbus/src/dispatcher.cpp (modified) (1 diff)
- trunk/libffado/external/dbus/tools/xml2cpp.cpp (modified) (1 diff)
- trunk/libffado/src/libavc/avc_definitions.cpp (modified) (1 diff)
- trunk/libffado/src/libieee1394/cycletimer.h (modified) (1 diff)
- trunk/libffado/src/maudio/maudio_avdevice.h (modified) (1 diff)
- trunk/libffado/src/motu/motu_avdevice.h (modified) (1 diff)
- trunk/libffado/support/dbus/ffado-dbus-server.cpp (modified) (1 diff)
- trunk/libffado/support/firmware/bridgeco-downloader.cpp (modified) (1 diff)
- trunk/libffado/support/firmware/downloader.cpp (modified) (1 diff)
- trunk/libffado/support/firmware/downloader.h (modified) (1 diff)
- trunk/libffado/support/firmware/fireworks-downloader.cpp (modified) (1 diff)
- trunk/libffado/tests/dumpiso_mod.cpp (modified) (3 diffs)
- trunk/libffado/tests/test-ffado.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/external/dbus/src/dispatcher.cpp
r562 r962 67 67 int Watch::descriptor() const 68 68 { 69 return dbus_watch_get_ fd((DBusWatch*)_int);69 return dbus_watch_get_unix_fd((DBusWatch*)_int); 70 70 } 71 71 trunk/libffado/external/dbus/tools/xml2cpp.cpp
r562 r962 84 84 const char* atomic_type_to_string( char t ) 85 85 { 86 static struct { c har type; char*name; } atos[] =86 static struct { const char type; const char *name; } atos[] = 87 87 { 88 88 { 'y', "::DBus::Byte" }, trunk/libffado/src/libavc/avc_definitions.cpp
r864 r962 118 118 std::ostream& operator<<( std::ostream& stream, ESamplingFrequency samplingFrequency ) 119 119 { 120 char*str;120 std::string str; 121 121 switch ( samplingFrequency ) { 122 122 case eSF_22050Hz: trunk/libffado/src/libieee1394/cycletimer.h
r879 r962 143 143 if (x < 0) { 144 144 x += TICKS_PER_SECOND * 128L; 145 } else if (x >= TICKS_PER_SECOND * 128L) {145 } else if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 146 146 x -= TICKS_PER_SECOND * 128L; 147 147 } 148 148 149 149 #ifdef DEBUG 150 if (x >= TICKS_PER_SECOND * 128L) {150 if (x >= (int64_t)(TICKS_PER_SECOND * 128L)) { 151 151 debugWarning("insufficient wrapping (max): %llu\n",x); 152 152 } trunk/libffado/src/maudio/maudio_avdevice.h
r864 r962 47 47 unsigned int vendor_id; 48 48 unsigned int model_id; 49 c har *vendor_name;50 c har *model_name;51 c har *filename;49 const char *vendor_name; 50 const char *model_name; 51 const char *filename; 52 52 }; 53 53 trunk/libffado/src/motu/motu_avdevice.h
r949 r962 106 106 unsigned int unit_specifier_id; 107 107 enum EMotuModel model; 108 c har *vendor_name;109 c har *model_name;108 const char *vendor_name; 109 const char *model_name; 110 110 }; 111 111 112 112 struct PortEntry { 113 c har *port_name;113 const char *port_name; 114 114 unsigned int port_dir; 115 115 unsigned int port_flags; trunk/libffado/support/dbus/ffado-dbus-server.cpp
r960 r962 95 95 int node_id; 96 96 int node_id_set; 97 c har* args[2];97 const char* args[2]; 98 98 }; 99 99 trunk/libffado/support/firmware/bridgeco-downloader.cpp
r900 r962 39 39 const char *argp_program_version = "bridgeco-downloader 0.2"; 40 40 const char *argp_program_bug_address = "<ffado-devel@lists.sf.net>"; 41 c har*doc = "bridgeco-downloader -- firmware downloader application for BridgeCo devices\n\n"41 const char *doc = "bridgeco-downloader -- firmware downloader application for BridgeCo devices\n\n" 42 42 "OPERATION: display\n" 43 43 " setguid GUID\n" trunk/libffado/support/firmware/downloader.cpp
r900 r962 40 40 static struct argp _argp = { options, parse_opt, args_doc, doc }; 41 41 struct argp* argp = &_argp; 42 static struct arguments _args = { 0, };42 static struct arguments _args = { {0}, }; 43 43 struct arguments* args = &_args; 44 44 trunk/libffado/support/firmware/downloader.h
r900 r962 29 29 /* ------------------------------------- */ 30 30 /* has to be provided by the application */ 31 extern c har *doc;31 extern const char *doc; 32 32 extern struct argp_option* options; 33 33 trunk/libffado/support/firmware/fireworks-downloader.cpp
r900 r962 49 49 const char *argp_program_version = "fireworks-downloader 0.2"; 50 50 const char *argp_program_bug_address = "<ffado-devel@lists.sf.net>"; 51 c har*doc = "fireworks-downloader -- firmware downloader application for ECHO Fireworks devices\n\n"51 const char *doc = "fireworks-downloader -- firmware downloader application for ECHO Fireworks devices\n\n" 52 52 "OPERATION: display\n" 53 53 " firmware FILE\n"; trunk/libffado/tests/dumpiso_mod.cpp
r907 r962 53 53 void parse_args(int argc, char **argv) 54 54 { 55 int i;56 55 char *tail; 57 unsigned long chan1, chan2;56 unsigned long i, chan1, chan2; 58 57 59 58 int c; … … 245 244 246 245 fprintf(stderr, "port: %ld\nchannels: %#016llx\nfile: %s\n", which_port, 247 listen_channels, filename);246 (long long unsigned int)(listen_channels), filename); 248 247 249 248 handle = raw1394_new_handle(); … … 258 257 259 258 do { 260 if ( raw1394_get_port_info(handle, NULL, 0) <= which_port) {259 if ((unsigned long)(raw1394_get_port_info(handle, NULL, 0)) <= which_port) { 261 260 fprintf(stderr, "Port %ld does not exist.\n", 262 261 which_port); trunk/libffado/tests/test-ffado.cpp
r866 r962 74 74 long int node_id; 75 75 long int node_id_set; 76 c har* args[2];76 const char* args[2]; 77 77 }; 78 78