Commit dbced7b0 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

Merge branch 'master' of https://github.com/Elphel/elphel-apps-php-extension

parents c2a1f3eb 7c0c7388

src/ext/elphel/elphel_php.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -904,15 +904,18 @@ PHP_FUNCTION(elphel_set_P_arr) 
    int reg_addr, reg_data, constAddNumber;

    int reg_addr, reg_data, constAddNumber;

    long multiMod;

    long multiMod;

    long broadcast=0;

    long broadcast=0;

    unsigned long uframe;







    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "la|lll", &port, &arr, &frame, &flags, &broadcast) == FAILURE) {

    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "la|lll", &port, &arr, &frame, &flags, &broadcast) == FAILURE) {

        RETURN_LONG(num_written);

        RETURN_LONG(num_written);

    }

    }

    if ((port <0) || (port >= SENSOR_PORTS))

    if ((port <0) || (port >= SENSOR_PORTS))

        RETURN_NULL();

        RETURN_NULL();

    if (frame <0) {

    if      (frame == -1)  uframe = ELPHEL_GLOBALPARS(port, G_THIS_FRAME) + FRAME_DEAFAULT_AHEAD; // old: use earliest frame

        frame=ELPHEL_GLOBALPARS(port, G_THIS_FRAME) + FRAME_DEAFAULT_AHEAD;

    else if (frame == -2)  uframe = 0xffffffffL; // (new nc393: use ASAP mode)

    }

    else                   uframe = (unsigned long) frame;



    flags |= (flags << 16); /// will accept flags both shifted and not shifted

    flags |= (flags << 16); /// will accept flags both shifted and not shifted

    flags &=0xffff0000;

    flags &=0xffff0000;

    init_sens();

    init_sens();
@@ -924,7 +927,7 @@ PHP_FUNCTION(elphel_set_P_arr) 




    write_data[0]=FRAMEPARS_SETFRAME | ((broadcast << 4) & 0xf0);

    write_data[0]=FRAMEPARS_SETFRAME | ((broadcast << 4) & 0xf0);





    write_data[1]=frame;

    write_data[1]=uframe;

    for(zend_hash_internal_pointer_reset_ex(arr_hash, &pointer);

    for(zend_hash_internal_pointer_reset_ex(arr_hash, &pointer);

            zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS;

            zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS;

            zend_hash_move_forward_ex(arr_hash, &pointer)) {

            zend_hash_move_forward_ex(arr_hash, &pointer)) {
@@ -974,7 +977,8 @@ PHP_FUNCTION(elphel_set_P_arr) 
        if (rslt<0) RETURN_LONG(-errno);

        if (rslt<0) RETURN_LONG(-errno);

        num_written=(rslt>>3) -1 ; ///actually written to driver

        num_written=(rslt>>3) -1 ; ///actually written to driver

    }

    }

    RETURN_LONG(frame);

//    RETURN_LONG(frame);

    RETURN_LONG( (long) uframe);

}

}





/**

/**