diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-01-10 11:00:40 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-01-10 11:00:40 -0800 |
| commit | 3dd59c3d5fa59f5bea3acc8e55c4d4a5091e66eb (patch) | |
| tree | 2f88dec06349002ce2406046ab260a7429a21b3d /shared-module/usb_midi | |
| parent | b5e40f52c2b1c2890c866d7305e0e99b4811b7f5 (diff) | |
Polish thanks to Dan's feedback
Diffstat (limited to 'shared-module/usb_midi')
| -rw-r--r-- | shared-module/usb_midi/__init__.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/shared-module/usb_midi/__init__.c b/shared-module/usb_midi/__init__.c index 60afeeef1..73a314b99 100644 --- a/shared-module/usb_midi/__init__.c +++ b/shared-module/usb_midi/__init__.c @@ -38,18 +38,11 @@ supervisor_allocation* usb_midi_allocation; -static inline uint16_t word_align(uint16_t size) { - if (size % 4 != 0) { - return (size & 0xfffc) + 0x4; - } - return size; -} - void usb_midi_init(void) { // TODO(tannewt): Make this dynamic. - uint16_t tuple_size = word_align(sizeof(mp_obj_tuple_t) + sizeof(mp_obj_t*) * 2); - uint16_t portin_size = word_align(sizeof(usb_midi_portin_obj_t)); - uint16_t portout_size = word_align(sizeof(usb_midi_portout_obj_t)); + uint16_t tuple_size = align32_size(sizeof(mp_obj_tuple_t) + sizeof(mp_obj_t*) * 2); + uint16_t portin_size = align32_size(sizeof(usb_midi_portin_obj_t)); + uint16_t portout_size = align32_size(sizeof(usb_midi_portout_obj_t)); // For each embedded MIDI Jack in the descriptor we create a Port usb_midi_allocation = allocate_memory(tuple_size + portin_size + portout_size, false); |
