Changeset 1805

Show
Ignore:
Timestamp:
03/08/10 13:59:51 (2 years ago)
Author:
arnonym
Message:

Fix some warnings...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/bounce/bounce_avdevice.cpp

    r1543 r1805  
    327327        // check value of ISO_CHANNEL register 
    328328        if(!readReg(BOUNCE_REGISTER_TX_ISOCHANNEL, &reg_isoch)) { 
    329             debugError("Could not read ISO_CHANNEL register\n", n); 
     329            debugError("Could not read ISO_CHANNEL register\n"); 
    330330            p->setChannel(-1); 
    331331            deallocateIsoChannel(isochannel); 
    …… 
    421421        // deallocate ISO channel 
    422422        if(!deallocateIsoChannel(isochannel)) { 
    423             debugError("Could not deallocate iso channel for SP\n",i); 
     423            debugError("Could not deallocate iso channel for SP\n"); 
    424424            return false; 
    425425        } 
    …… 
    500500 
    501501    if(!get1394Service().read_quadlet( nodeId, addr, result ) ) { 
    502         debugError("Could not read from node 0x%04X addr 0x%012X\n", nodeId, addr); 
     502        debugError("Could not read from node 0x%04X addr 0x%012X\n", nodeId, (unsigned int)addr); 
    503503        return false; 
    504504    } 
    …… 
    522522 
    523523    if(!get1394Service().write_quadlet( nodeId, addr, data ) ) { 
    524         debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr); 
     524        debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, (unsigned int)addr); 
    525525        return false; 
    526526    } 

  • trunk/libffado/src/bounce/bounce_slave_avdevice.cpp

    r1550 r1805  
    403403    dir.unit_spec_id    = FFADO_BOUNCE_SERVER_SPECID; 
    404404    dir.unit_sw_version = 0x00010001; 
    405     leaf = FFADO_BOUNCE_SERVER_MODELNAME; 
     405    leaf = (char*)FFADO_BOUNCE_SERVER_MODELNAME; 
    406406    dir.nr_textual_leafs = 1; 
    407407    dir.textual_leafs = &leaf;