Changeset 1601


Ignore:
Timestamp:
02/18/10 10:34:55 (11 years ago)
Author:
merek
Message:

Merge from UMP r1717

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r1592 r1601  
    380380if (OSCamOperatingSystem MATCHES "Mac OS X")
    381381add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -m32")
     382elseif (OSCAM_SYSTEM_NAME MATCHES "NSLU2")
     383add_definitions ("-O2 -Winline -Wall -finline-functions -fomit-frame-pointer")
    382384else (OSCamOperatingSystem MATCHES "Mac OS X")
    383385add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer")
  • trunk/csctapi/icc_async.c

    r1588 r1601  
    186186        *card = FALSE;
    187187   
    188     cs_debug_mask (D_TRACE, "IFD: Status = %s", in ? "card": "no card");
     188    //cs_debug_mask (D_TRACE, "IFD: Status = %s", in ? "card": "no card");
    189189   
    190190    return OK;
  • trunk/oscam.c

    r1584 r1601  
    426426  int i;
    427427
    428   cs_dblevel ^= D_ALL_DUMP;
     428    switch (cs_dblevel) {
     429        case 0:
     430            cs_dblevel = 1;
     431            break;
     432        case 32:
     433            cs_dblevel = 63;
     434            break;
     435        case 63:
     436            cs_dblevel = 0;
     437            break;
     438        default:
     439            cs_dblevel <<= 1;
     440    }
    429441  if (master_pid==getpid())
    430442    for (i=0; i<CS_MAXPID && client[i].pid; i++)
Note: See TracChangeset for help on using the changeset viewer.