Skip to content

Set size of callback irq array to IrqCnt #2584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2016
Merged

Set size of callback irq array to IrqCnt #2584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions hal/api/CAN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ class CAN {
EpIrq,
AlIrq,
BeIrq,
IdIrq
IdIrq,

IrqCnt
};

/** Attach a function to call whenever a CAN frame received interrupt is
Expand Down Expand Up @@ -246,7 +248,7 @@ class CAN {
virtual void lock();
virtual void unlock();
can_t _can;
Callback<void()> _irq[9];
Callback<void()> _irq[IrqCnt];
PlatformMutex _mutex;
};

Expand Down
6 changes: 4 additions & 2 deletions hal/api/SerialBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ class SerialBase {

enum IrqType {
RxIrq = 0,
TxIrq
TxIrq,

IrqCnt
};

enum Flow {
Expand Down Expand Up @@ -231,7 +233,7 @@ class SerialBase {
#endif

serial_t _serial;
Callback<void()> _irq[2];
Callback<void()> _irq[IrqCnt];
int _baud;

};
Expand Down