X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/94b8e4f0425cebad0a186daf054168fa6910f9b8..91dfab84182937b62ef64cb12d8e4f89e6d5c3ec:/lincan/src/sja1000.c diff --git a/lincan/src/sja1000.c b/lincan/src/sja1000.c index 9211511..7b1f88d 100644 --- a/lincan/src/sja1000.c +++ b/lincan/src/sja1000.c @@ -447,11 +447,11 @@ void sja1000_irq_write_handler(struct chip_t *chip, struct msgobj_t *obj) int sja1000_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj) { /* dummy lock to prevent preemption fully portable way */ - spinlock_t dummy_lock; + can_spinlock_t dummy_lock; /* preempt_disable() */ - spin_lock_init(&dummy_lock); - spin_lock(&dummy_lock); + can_spin_lock_init(&dummy_lock); + can_spin_lock(&dummy_lock); set_bit(OBJ_TX_REQUEST,&obj->flags); while(!test_and_set_bit(OBJ_TX_LOCK,&obj->flags)){ @@ -465,7 +465,7 @@ int sja1000_wakeup_tx(struct chip_t *chip, struct msgobj_t *obj) } /* preempt_enable(); */ - spin_unlock(&dummy_lock); + can_spin_unlock(&dummy_lock); return 0; }