gex/gex-core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed weirdness

Browse Source
This commit is contained in:
MightyPork
2018-01-24 22:43:00 +01:00
parent 63a7852554
commit 334a89f055
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/rsc_enum.h
+3 -3
View File
@@ -68,7 +68,7 @@ typedef uint8_t ResourceMap[RSCMAP_LEN];
static inline bool rscmap_is_free(ResourceMap *rscmap, Resource rsc)
{
return (0 == (*rscmap[((rsc)>>3)&0xFF] & (1<<((rsc)&0x7))));
return (0 == ((*rscmap)[((rsc)>>3)&0xFF] & (1<<((rsc)&0x7))));
}
static inline bool rscmap_is_held(ResourceMap *rscmap, Resource rsc)
@@ -78,12 +78,12 @@ static inline bool rscmap_is_held(ResourceMap *rscmap, Resource rsc)
static inline void rscmap_claim(ResourceMap *rscmap, Resource rsc)
{
*rscmap[((rsc)>>3)&0xFF] |= (1<<((rsc)&0x7));
(*rscmap)[((rsc)>>3)&0xFF] |= (1<<((rsc)&0x7));
}
static inline void rscmap_free(ResourceMap *rscmap, Resource rsc)
{
*rscmap[((rsc)>>3)&0xFF] &= ~(1<<((rsc)&0x7));
(*rscmap)[((rsc)>>3)&0xFF] &= ~(1<<((rsc)&0x7));
}
//#define RSC_IS_FREE(rscmap, rsc) (0 == (rscmap[((rsc)>>3)&0xFF] & (1<<((rsc)&0x7))))
platform/irq_dispatcher.c
-7
View File
@@ -85,8 +85,6 @@ void irqd_init(void)
// NVIC_EnableIRQ(TIM1_BRK_UP_TRG_COM_IRQn); /*!< TIM1 Break, Update, Trigger and Commutation Interrupt */ // - handled by hal msp init
// NVIC_EnableIRQ(TIM1_CC_IRQn); /*!< TIM1 Capture Compare Interrupt */
// NVIC_EnableIRQ(USB_IRQn); /*!< USB global Interrupt & EXTI Line18 Interrupt */ // - USB IRQ is handled by the USB library
hexDump("Callbacks", &callbacks, sizeof(callbacks));
}
//void Default_Handler(void)
@@ -147,12 +145,7 @@ static struct cbslot *get_slot_for_periph(void *periph)
void irqd_attach(void *periph, IrqCallback callback, void *arg)
{
dbg("Attach irqd for periph %p, cb %p()", periph, callback);
hexDump("Callbacks", &callbacks, sizeof(callbacks));
struct cbslot *slot = get_slot_for_periph(periph);
dbg("slot %p cb is %p()", slot, slot->callback);
assert_param(slot->callback == NULL);
slot->callback = callback;
slot->arg = arg;