Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: whitequark/libfx2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4067898ffac1
Choose a base ref
...
head repository: whitequark/libfx2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: faae80242c84
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 19, 2018

  1. Add back compatibility with sdcc 3.5. 

    This is what's installed on Travis CI.
    @whitequark
    whitequark committed Nov 19, 2018
    Copy the full SHA
    faae802 View commit details
Showing with 9 additions and 0 deletions.
  1. +4 −0 firmware/library/include/fx2usbdfu.h
  2. +5 −0 firmware/library/include/fx2usbmassstor.h
4 changes: 4 additions & 0 deletions firmware/library/include/fx2usbdfu.h
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,11 @@ struct usb_dfu_iface_state {
#ifndef DOXYGEN
// Private fields, subject to change at any time.
volatile enum usb_dfu_status status;
#if __SDCC_VERSION_MAJOR > 3 || __SDCC_VERSION_MINOR >= 7
volatile bool pending, sync;
#else
volatile uint8_t pending, sync;
#endif
uint16_t length;
uint32_t offset;
#endif
5 changes: 5 additions & 0 deletions firmware/library/include/fx2usbmassstor.h
View file
Original file line number Diff line number Diff line change
@@ -49,8 +49,13 @@ struct usb_mass_storage_bbb_state {
} _state;
uint32_t _tag;
uint8_t _lun;
#if __SDCC_VERSION_MAJOR > 3 || __SDCC_VERSION_MINOR >= 7
bool _data_in;
bool _success;
#else
uint8_t _data_in;
uint8_t _success;
#endif
uint32_t _data_length;
uint32_t _residue;
#endif