diff options
| author | barthess <barthess@yandex.ru> | 2016-10-18 10:37:12 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2016-10-18 10:37:12 +0300 |
| commit | 6e8fa7ae468b5584e3622b467ea0dc213cd98e51 (patch) | |
| tree | eca9ef8f49b41b7bd65fc76ec2bca48c287a0470 /os/hal/src | |
| parent | 9263bcd5a4a30b5eb6d68c62ab8ad5a7800291f7 (diff) | |
| parent | aeb83bf0db1ce611518fc71e9c182602e39772e5 (diff) | |
| download | ChibiOS-Contrib-6e8fa7ae468b5584e3622b467ea0dc213cd98e51.tar.gz ChibiOS-Contrib-6e8fa7ae468b5584e3622b467ea0dc213cd98e51.tar.bz2 ChibiOS-Contrib-6e8fa7ae468b5584e3622b467ea0dc213cd98e51.zip | |
Merge branch 'master' of github.com:ChibiOS/ChibiOS-Contrib
Diffstat (limited to 'os/hal/src')
| -rw-r--r-- | os/hal/src/hal_onewire.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/os/hal/src/hal_onewire.c b/os/hal/src/hal_onewire.c index 49063a6..85630d9 100644 --- a/os/hal/src/hal_onewire.c +++ b/os/hal/src/hal_onewire.c @@ -251,7 +251,6 @@ static void ow_write_bit_I(onewireDriver *owp, ioline_t bit) { static void ow_reset_cb(PWMDriver *pwmp, onewireDriver *owp) { owp->reg.slave_present = (PAL_LOW == ow_read_bit(owp)); - osalSysLockFromISR(); pwmDisableChannelI(pwmp, owp->config->sample_channel); osalThreadResumeI(&owp->thread, MSG_OK); @@ -661,7 +660,7 @@ bool onewireReset(onewireDriver *owp) { pwmcfg->channels[mch].callback = NULL; pwmcfg->channels[mch].mode = owp->config->pwmmode; pwmcfg->channels[sch].callback = pwm_reset_cb; - pwmcfg->channels[sch].mode = PWM_OUTPUT_ACTIVE_LOW; + pwmcfg->channels[sch].mode = PWM_OUTPUT_DISABLED; ow_bus_active(owp); @@ -714,7 +713,7 @@ void onewireRead(onewireDriver *owp, uint8_t *rxbuf, size_t rxbytes) { pwmcfg->channels[mch].callback = NULL; pwmcfg->channels[mch].mode = owp->config->pwmmode; pwmcfg->channels[sch].callback = pwm_read_bit_cb; - pwmcfg->channels[sch].mode = PWM_OUTPUT_ACTIVE_LOW; + pwmcfg->channels[sch].mode = PWM_OUTPUT_DISABLED; ow_bus_active(owp); osalSysLock(); @@ -848,7 +847,7 @@ size_t onewireSearchRom(onewireDriver *owp, uint8_t *result, pwmcfg->channels[mch].callback = NULL; pwmcfg->channels[mch].mode = owp->config->pwmmode; pwmcfg->channels[sch].callback = pwm_search_rom_cb; - pwmcfg->channels[sch].mode = PWM_OUTPUT_ACTIVE_LOW; + pwmcfg->channels[sch].mode = PWM_OUTPUT_DISABLED; ow_bus_active(owp); osalSysLock(); |