Merge pull request #4852 from janjongboom/cortexm0p_bugs

SAM_CortexM0P uses uninitialized memory in i2c and uses out of bounds array in pwmout
pull/4887/merge
Jimmy Brisson 2017-08-10 09:38:53 -05:00 committed by GitHub
commit 00ab1fd6b2
2 changed files with 2 additions and 2 deletions

View File

@ -173,7 +173,7 @@ void i2c_frequency(i2c_t *obj, int hz)
int32_t baud_rate;
int32_t tmp_baud;
int32_t tmp_baud_hs;
enum status_code tmp_status_code;
enum status_code tmp_status_code = STATUS_OK;
/* Sanity check arguments */
MBED_ASSERT(obj);

View File

@ -60,7 +60,7 @@ static void pwmout_set_period(pwmout_t* obj, int period_us)
freq_hz = system_gclk_gen_get_hz(obj->clock_source);
for (i=0; i<sizeof(tcc_prescaler); i++) {
for (i=0; i<sizeof(tcc_prescaler) / sizeof(tcc_prescaler[0]); i++) {
div_freq = freq_hz >> tcc_prescaler[i];
if (!div_freq) break;
us_per_cycle = 1000000.00 / div_freq;