addr &= (~write_bit);
/* Set up read */
- start_timer = drxbsp_hst_clock();
+ start_timer = jiffies_to_msecs(jiffies);
do {
/* RMW to aud TR IF until request is granted or timeout */
stat = drxj_dap_read_modify_write_reg16(dev_addr,
if (stat != 0)
break;
- current_timer = drxbsp_hst_clock();
+ current_timer = jiffies_to_msecs(jiffies);
delta_timer = current_timer - start_timer;
if (delta_timer > DRXJ_DAP_AUDTRIF_TIMEOUT) {
stat = -EIO;
/* Wait for read ready status or timeout */
if (stat == 0) {
- start_timer = drxbsp_hst_clock();
+ start_timer = jiffies_to_msecs(jiffies);
while ((tr_status & AUD_TOP_TR_CTR_FIFO_RD_RDY__M) !=
AUD_TOP_TR_CTR_FIFO_RD_RDY_READY) {
if (stat != 0)
break;
- current_timer = drxbsp_hst_clock();
+ current_timer = jiffies_to_msecs(jiffies);
delta_timer = current_timer - start_timer;
if (delta_timer > DRXJ_DAP_AUDTRIF_TIMEOUT) {
stat = -EIO;
/* Force write bit */
addr |= write_bit;
- start_timer = drxbsp_hst_clock();
+ start_timer = jiffies_to_msecs(jiffies);
do {
/* RMW to aud TR IF until request is granted or timeout */
stat = drxj_dap_read_modify_write_reg16(dev_addr,
if (stat != 0)
break;
- current_timer = drxbsp_hst_clock();
+ current_timer = jiffies_to_msecs(jiffies);
delta_timer = current_timer - start_timer;
if (delta_timer > DRXJ_DAP_AUDTRIF_TIMEOUT) {
stat = -EIO;
}
if ((cmd->cmd) == SIO_HI_RA_RAM_CMD_RESET)
- drxbsp_hst_sleep(1);
+ msleep(1);
/* Detect power down to ommit reading result */
powerdown_cmd = (bool) ((cmd->cmd == SIO_HI_RA_RAM_CMD_CONFIG) &&
drxbsp_i2c_write_read(&wake_up_addr, 1, &data,
(struct i2c_device_addr *)(NULL), 0,
(u8 *)(NULL));
- drxbsp_hst_sleep(10);
+ msleep(10);
retry_count++;
} while ((drxbsp_i2c_write_read
((struct i2c_device_addr *) (NULL), 0, (u8 *)(NULL), dev_addr, 1,
!= 0) && (retry_count < DRXJ_MAX_RETRIES_POWERUP));
/* Need some recovery time .... */
- drxbsp_hst_sleep(10);
+ msleep(10);
if (retry_count == DRXJ_MAX_RETRIES_POWERUP)
return -EIO;
RR16( dev_addr, SIO_SA_TX_COMMAND__A, &data );
WR16( dev_addr, SIO_SA_TX_COMMAND__A, data | SIO_SA_TX_COMMAND_TX_ENABLE__M );
*/
- start_time = drxbsp_hst_clock();
+ start_time = jiffies_to_msecs(jiffies);
do {
rc = DRXJ_DAP.read_reg16func(dev_addr, SIO_SA_TX_STATUS__A, &data, 0);
if (rc != 0) {
pr_err("error %d\n", rc);
goto rw_error;
}
- } while ((data & SIO_SA_TX_STATUS_BUSY__M) && ((drxbsp_hst_clock() - start_time) < DRXJ_MAX_WAITTIME));
+ } while ((data & SIO_SA_TX_STATUS_BUSY__M) && ((jiffies_to_msecs(jiffies) - start_time) < DRXJ_MAX_WAITTIME));
if (data & SIO_SA_TX_STATUS_BUSY__M)
return -EIO;
}
/* Wait until SCU has processed command */
- start_time = drxbsp_hst_clock();
+ start_time = jiffies_to_msecs(jiffies);
do {
rc = DRXJ_DAP.read_reg16func(dev_addr, SCU_RAM_COMMAND__A, &cur_cmd, 0);
if (rc != 0) {
goto rw_error;
}
} while (!(cur_cmd == DRX_SCU_READY)
- && ((drxbsp_hst_clock() - start_time) < DRXJ_MAX_WAITTIME));
+ && ((jiffies_to_msecs(jiffies) - start_time) < DRXJ_MAX_WAITTIME));
if (cur_cmd != DRX_SCU_READY)
return -EIO;
}
/* Wait at least 3*128*(1/sysclk) <<< 1 millisec */
- rc = drxbsp_hst_sleep(1);
- if (rc != 0) {
- pr_err("error %d\n", rc);
- goto rw_error;
- }
+ msleep(1);
*count = 0;
rc = DRXJ_DAP.read_reg16func(dev_addr, IQM_AF_PHASE0__A, &data, 0);
/* external attributes for storing aquired channel constellation */
ext_attr = (struct drxj_data *) demod->my_ext_attr;
*lock_status = DRX_NOT_LOCKED;
- start_time = drxbsp_hst_clock();
+ start_time = jiffies_to_msecs(jiffies);
state = NO_LOCK;
do {
rc = ctrl_lock_status(demod, lock_status);
state = DEMOD_LOCKED;
/* some delay to see if fec_lock possible TODO find the right value */
timeout_ofs += DRXJ_QAM_DEMOD_LOCK_EXT_WAITTIME; /* see something, waiting longer */
- d_locked_time = drxbsp_hst_clock();
+ d_locked_time = jiffies_to_msecs(jiffies);
}
}
break;
case DEMOD_LOCKED:
if ((*lock_status == DRXJ_DEMOD_LOCK) && /* still demod_lock in 150ms */
- ((drxbsp_hst_clock() - d_locked_time) >
+ ((jiffies_to_msecs(jiffies) - d_locked_time) >
DRXJ_QAM_FEC_LOCK_WAITTIME)) {
rc = DRXJ_DAP.read_reg16func(demod->my_i2c_dev_addr, QAM_SY_TIMEOUT__A, &data, 0);
if (rc != 0) {
goto rw_error;
}
state = SYNC_FLIPPED;
- drxbsp_hst_sleep(10);
+ msleep(10);
}
break;
case SYNC_FLIPPED:
state = SPEC_MIRRORED;
/* reset timer TODO: still need 500ms? */
start_time = d_locked_time =
- drxbsp_hst_clock();
+ jiffies_to_msecs(jiffies);
timeout_ofs = 0;
} else { /* no need to wait lock */
start_time =
- drxbsp_hst_clock() -
+ jiffies_to_msecs(jiffies) -
DRXJ_QAM_MAX_WAITTIME - timeout_ofs;
}
}
break;
case SPEC_MIRRORED:
if ((*lock_status == DRXJ_DEMOD_LOCK) && /* still demod_lock in 150ms */
- ((drxbsp_hst_clock() - d_locked_time) >
+ ((jiffies_to_msecs(jiffies) - d_locked_time) >
DRXJ_QAM_FEC_LOCK_WAITTIME)) {
rc = ctrl_get_qam_sig_quality(demod, &sig_quality);
if (rc != 0) {
}
/* no need to wait lock */
start_time =
- drxbsp_hst_clock() -
+ jiffies_to_msecs(jiffies) -
DRXJ_QAM_MAX_WAITTIME - timeout_ofs;
}
}
default:
break;
}
- drxbsp_hst_sleep(10);
+ msleep(10);
} while
((*lock_status != DRX_LOCKED) &&
(*lock_status != DRX_NEVER_LOCK) &&
- ((drxbsp_hst_clock() - start_time) <
+ ((jiffies_to_msecs(jiffies) - start_time) <
(DRXJ_QAM_MAX_WAITTIME + timeout_ofs))
);
/* Returning control to apllication ... */
/* external attributes for storing aquired channel constellation */
ext_attr = (struct drxj_data *) demod->my_ext_attr;
*lock_status = DRX_NOT_LOCKED;
- start_time = drxbsp_hst_clock();
+ start_time = jiffies_to_msecs(jiffies);
state = NO_LOCK;
do {
rc = ctrl_lock_status(demod, lock_status);
if (sig_quality.MER > 268) {
state = DEMOD_LOCKED;
timeout_ofs += DRXJ_QAM_DEMOD_LOCK_EXT_WAITTIME; /* see something, wait longer */
- d_locked_time = drxbsp_hst_clock();
+ d_locked_time = jiffies_to_msecs(jiffies);
}
}
break;
case DEMOD_LOCKED:
if (*lock_status == DRXJ_DEMOD_LOCK) {
if ((channel->mirror == DRX_MIRROR_AUTO) &&
- ((drxbsp_hst_clock() - d_locked_time) >
+ ((jiffies_to_msecs(jiffies) - d_locked_time) >
DRXJ_QAM_FEC_LOCK_WAITTIME)) {
ext_attr->mirror = DRX_MIRROR_YES;
rc = qam_flip_spec(demod, channel);
}
state = SPEC_MIRRORED;
/* reset timer TODO: still need 300ms? */
- start_time = drxbsp_hst_clock();
+ start_time = jiffies_to_msecs(jiffies);
timeout_ofs = -DRXJ_QAM_MAX_WAITTIME / 2;
}
}
default:
break;
}
- drxbsp_hst_sleep(10);
+ msleep(10);
} while
((*lock_status < DRX_LOCKED) &&
(*lock_status != DRX_NEVER_LOCK) &&
- ((drxbsp_hst_clock() - start_time) <
+ ((jiffies_to_msecs(jiffies) - start_time) <
(DRXJ_QAM_MAX_WAITTIME + timeout_ofs)));
return 0;
pr_err("error %d\n", rc);
goto rw_error;
}
- rc = drxbsp_hst_sleep(1);
- if (rc != 0) {
- pr_err("error %d\n", rc);
- goto rw_error;
- }
+ msleep(1);
/* TODO first make sure that everything keeps working before enabling this */
/* PowerDownAnalogBlocks() */
}
}
- rc = drxbsp_tuner_open(demod->my_tuner);
- if (rc != 0) {
- pr_err("error %d\n", rc);
- goto rw_error;
- }
-
if (common_attr->tuner_port_nr == 1) {
bool bridge_closed = false;
rc = ctrl_i2c_bridge(demod, &bridge_closed);
goto rw_error;
}
}
- rc = drxbsp_tuner_close(demod->my_tuner);
- if (rc != 0) {
- pr_err("error %d\n", rc);
- goto rw_error;
- }
if (common_attr->tuner_port_nr == 1) {
bool bridge_closed = false;
rc = ctrl_i2c_bridge(demod, &bridge_closed);
return -EIO;
}
- result =drxbsp_hst_memcmp(curr_ptr,
- mc_data_buffer,
- bytes_to_comp);
+ result = memcmp(curr_ptr, mc_data_buffer,
+ bytes_to_comp);
if (result) {
pr_err("error verifying firmware at pos %u\n",
projects / cascardo / linux.git / blobdiff