Skip to content

Commit

Permalink
edge_control: rebuild libmbed.a
Browse files Browse the repository at this point in the history
  • Loading branch information
pennam committed Nov 16, 2023
1 parent 99ec103 commit e2e2c64
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class AT_CellularContext : public CellularContext {
* @return NIDD context text, e.g. Non-IP or NONIP
*/
virtual const char *get_nonip_context_type_str();
virtual void enable_access_technology();
virtual nsapi_error_t enable_access_technology();
virtual void set_cid(int cid);

private:
Expand All @@ -135,15 +135,15 @@ class AT_CellularContext : public CellularContext {

PinName _dcd_pin;
bool _active_high;
RadioAccessTechnologyType _rat;
FrequencyBand _band;

protected:
char _found_apn[MAX_APN_LENGTH];
// flag indicating if CP was requested to be setup
bool _cp_req;
bool _is_connected;
ATHandler &_at;
RadioAccessTechnologyType _rat;
FrequencyBand _band;
};

} // namespace mbed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class GEMALTO_CINTERION_CellularContext: public AT_CellularContext {
virtual NetworkStack *get_stack();
#endif // NSAPI_PPP_AVAILABLE
virtual nsapi_error_t do_user_authentication();
virtual nsapi_error_t enable_access_technology();
};

} /* namespace mbed */
Expand Down
11 changes: 1 addition & 10 deletions cores/arduino/mbed/platform/include/platform/Callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@
#include <mstd_type_traits>
#include <mstd_functional>

#pragma GCC push_options
// This prevents the GCC compiler from applying optimizations that assume the code follows strict aliasing rules.
// In order to prevent bugs arising from undefined behavior that is tricky to find in the Callback implementation,
// or simply from compiler bugs in GCC.
#pragma GCC optimize("-fno-strict-aliasing")
// This prevents the GCC compiler from generating incorrect inline code for the Callback constructor.
#pragma GCC optimize("-fno-inline")

// Controlling switches from config:
// MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL - support storing non-trivial function objects
// MBED_CONF_PLATFORM_CALLBACK_COMPARABLE - support memcmp comparing stored objects (requires zero padding)
Expand All @@ -44,6 +36,7 @@
#define MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL 1
#endif


namespace mbed {
/** \addtogroup platform-public-api */
/** @{*/
Expand Down Expand Up @@ -842,6 +835,4 @@ Callback(R(*func)(const volatile T *, ArgTs...), const volatile U *arg) -> Callb

} // namespace mbed

#pragma GCC pop_options

#endif
2 changes: 1 addition & 1 deletion variants/EDGE_CONTROL/defines.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
-DFEATURE_STORAGE=1
-D__FPU_PRESENT=1
-D__MBED__=1
-DMBED_BUILD_TIMESTAMP=1690447154.5646534
-DMBED_BUILD_TIMESTAMP=1700127377.3953335
-D__MBED_CMSIS_RTOS_CM
-DMBED_MPU_CUSTOM
-DMBED_TICKLESS
Expand Down
27 changes: 27 additions & 0 deletions variants/EDGE_CONTROL/includes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,33 @@
-iwithprefixbefore/mbed/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source
-iwithprefixbefore/mbed/connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver
-iwithprefixbefore/mbed/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x
-iwithprefixbefore/mbed/connectivity/drivers/cellular
-iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair
-iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair/ALT1250
-iwithprefixbefore/mbed/connectivity/drivers/cellular/Altair/ALT1250/PPP
-iwithprefixbefore/mbed/connectivity/drivers/cellular/GEMALTO
-iwithprefixbefore/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION
-iwithprefixbefore/mbed/connectivity/drivers/cellular/GENERIC
-iwithprefixbefore/mbed/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP
-iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech
-iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech/DragonflyNano
-iwithprefixbefore/mbed/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP
-iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL
-iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/BC95
-iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/BG96
-iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/EC2X
-iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/M26
-iwithprefixbefore/mbed/connectivity/drivers/cellular/QUECTEL/UG96
-iwithprefixbefore/mbed/connectivity/drivers/cellular/RiotMicro
-iwithprefixbefore/mbed/connectivity/drivers/cellular/RiotMicro/AT
-iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT
-iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/HE910
-iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/ME310
-iwithprefixbefore/mbed/connectivity/drivers/cellular/TELIT/ME910
-iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX
-iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/AT
-iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/N2XX
-iwithprefixbefore/mbed/connectivity/drivers/cellular/UBLOX/PPP
-iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310
-iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840
-iwithprefixbefore/mbed/connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/include
Expand Down
Binary file modified variants/EDGE_CONTROL/libs/libmbed.a
Binary file not shown.
Loading

0 comments on commit e2e2c64

Please sign in to comment.