Changeset 909
- Timestamp:
- 03/07/08 11:57:14 (16 years ago)
- Files:
-
- trunk/libffado/src/devicemanager.cpp (modified) (1 diff)
- trunk/libffado/src/libieee1394/ieee1394service.cpp (modified) (3 diffs)
- trunk/libffado/src/libieee1394/ieee1394service.h (modified) (1 diff)
- trunk/libffado/tests/test-ieee1394service.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/devicemanager.cpp
r898 r909 143 143 assert(m_busreset_functors.size() == 0); 144 144 145 unsigned int nb_detected_ports = Ieee1394Service::detectNbPorts(); 145 int nb_detected_ports = Ieee1394Service::detectNbPorts(); 146 if (nb_detected_ports < 0) { 147 debugFatal("Failed to detect the number of 1394 adapters. Is the IEEE1394 stack loaded (raw1394)?\n"); 148 return false; 149 } 146 150 if (nb_detected_ports == 0) { 147 debugFatal("No firewire portsfound.\n");151 debugFatal("No firewire adapters (ports) found.\n"); 148 152 return false; 149 153 } trunk/libffado/src/libieee1394/ieee1394service.cpp
r904 r909 124 124 } 125 125 126 unsignedint127 Ieee1394Service::detectNbPorts( 126 int 127 Ieee1394Service::detectNbPorts() 128 128 { 129 129 raw1394handle_t tmp_handle = raw1394_new_handle(); 130 130 if ( tmp_handle == NULL ) { 131 131 debugError("Could not get libraw1394 handle.\n"); 132 return 0;132 return -1; 133 133 } 134 134 struct raw1394_portinfo pinf[IEEE1394SERVICE_MAX_FIREWIRE_PORTS]; … … 138 138 if (nb_detected_ports < 0) { 139 139 debugError("Failed to detect number of ports\n"); 140 return 0;140 return -1; 141 141 } 142 142 return nb_detected_ports; … … 147 147 { 148 148 using namespace std; 149 150 int nb_ports = detectNbPorts(); 151 if (port + 1 > nb_ports) { 152 debugFatal("Requested port (%d) out of range (# ports: %d)\n", port, nb_ports); 153 } 149 154 150 155 m_handle = raw1394_new_handle_on_port( port ); trunk/libffado/src/libieee1394/ieee1394service.h
r864 r909 60 60 * @return the number of ports 61 61 */ 62 static unsignedint detectNbPorts();62 static int detectNbPorts(); 63 63 64 64 /** trunk/libffado/tests/test-ieee1394service.cpp
r881 r909 57 57 58 58 #define DIFF_CONSIDERED_LARGE (3027/2) 59 int PORT_TO_USE = 1;59 int PORT_TO_USE = 0; 60 60 61 61 int max_diff=-99999; … … 283 283 m_service = new Ieee1394Service(); 284 284 m_service->setVerboseLevel(DEBUG_LEVEL_VERBOSE); 285 m_service->initialize(PORT_TO_USE); 285 if(!m_service->initialize(PORT_TO_USE)) { 286 printf("Could not initialize 1394 service\n"); 287 delete m_service; 288 exit(-1); 289 } 286 290 m_service->setThreadParameters(true, 60); 287 291