michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi: update to unified kernel

Browse source 
Use new semaphore APIs from unified kernel.

Change-Id: I0424e8b1fee51df6fd3eb06ba6d99284a2e83393
Signed-off-by: Baohong Liu <baohong.liu@intel.com>
This commit is contained in:
Baohong Liu 2016-11-08 17:12:08 -08:00 • committed by Anas Nashif
commit 6096e7866c
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/spi/spi_qmsi.c
View file

@ -47,7 +47,7 @@ struct spi_qmsi_runtime {
qm_spi_config_t cfg; qm_spi_config_t cfg;
int rc; int rc;
bool loopback; bool loopback;
struct nano_sem sem; struct k_sem sem;
#ifdef CONFIG_DEVICE_POWER_MANAGEMENT #ifdef CONFIG_DEVICE_POWER_MANAGEMENT
uint32_t device_power_state; uint32_t device_power_state;
#ifdef CONFIG_SYS_POWER_DEEP_SLEEP #ifdef CONFIG_SYS_POWER_DEEP_SLEEP
@ -155,13 +155,13 @@ static int spi_qmsi_transceive(struct device *dev,
qm_spi_async_transfer_t *xfer; qm_spi_async_transfer_t *xfer;
int rc; int rc;
nano_sem_take(&context->sem, TICKS_UNLIMITED); k_sem_take(&context->sem, K_FOREVER);
if (pending_transfers[spi].dev) { if (pending_transfers[spi].dev) {
nano_sem_give(&context->sem); k_sem_give(&context->sem);
return -EBUSY; return -EBUSY;
} }
pending_transfers[spi].dev = dev; pending_transfers[spi].dev = dev;
nano_sem_give(&context->sem); k_sem_give(&context->sem);
device_busy_set(dev); device_busy_set(dev);
@ -285,8 +285,8 @@ static int spi_qmsi_init(struct device *dev)
context->gpio_cs = gpio_cs_init(spi_config); context->gpio_cs = gpio_cs_init(spi_config);
device_sync_call_init(&context->sync); device_sync_call_init(&context->sync);
nano_sem_init(&context->sem); k_sem_init(&context->sem, 0, UINT_MAX);
nano_sem_give(&context->sem); k_sem_give(&context->sem);
spi_master_set_power_state(dev, DEVICE_PM_ACTIVE_STATE); spi_master_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);