Change ISR wrapper macros to allow multiple interrupts use the same handler
Fix typo on SRS ISR wrapper macro