Skip to content

C++ compatibility and missing _exit implementation #1

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

C++ compatibility and missing _exit implementation #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e1baad
Add missing _exit symbol
c3d Aug 1, 2023
91cb472
Make header compatible with C++
c3d Aug 7, 2023
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
20 changes: 14 additions & 6 deletions dmcp/dmcp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


The software and related material is released as “NOMAS” (NOt MAnufacturer Supported).
The software and related material is released as “NOMAS” (NOt MAnufacturer Supported).

1. Info is released to assist customers using, exploring and extending the product
2. Do NOT contact the manufacturer with questions, seeking support, etc. regarding
Expand All @@ -45,6 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#include <stdint.h>

#ifdef __cplusplus
extern "C" {
#endif // __cplusplus

typedef unsigned int uint;

#include "ff_ifc.h"
Expand Down Expand Up @@ -192,7 +196,7 @@ int lcd_textToWidthR(disp_stat_t * ds, const char* text, int expected_width, int
void lcd_writeTextWidth(disp_stat_t * ds, const char* text);

// Get text which fits in expected width *without breaking words*
// - word could be broken in the middle only when is placed single long word on line
// - word could be broken in the middle only when is placed single long word on line
int lcd_textForWidth(disp_stat_t * ds, const char* text, int expected_width, int * plen);


Expand Down Expand Up @@ -463,7 +467,7 @@ int sys_last_scan(int *k1, int *k2);


/////////////////////////////////
// Low level diagnostics
// Low level diagnostics
/////////////////////////////////

void suspended_bg_key_read();
Expand Down Expand Up @@ -516,7 +520,7 @@ int qspi_user_size();
// ----------------------------------


// Printer
// Printer
#define PRINT_GRA_LN 1
#define PRINT_TXT_LN 0

Expand Down Expand Up @@ -816,7 +820,7 @@ int run_menu_item_sys(uint8_t line_id);
#define VAL_ST(x) VAL(x,calc_state)
#define CLR_ST(x) CLR(x,calc_state)
#define SET_ST(x) SET(x,calc_state)
#define SETMSK_ST(x,m) SETMSK(x,m,calc_state)
#define SETMSK_ST(x,m) SETMSK(x,m,calc_state)
#define SETBY_ST(c,x) SETBY(c,x,calc_state)


Expand Down Expand Up @@ -934,7 +938,7 @@ int sys_timer_active(int timer_ix);
int sys_timer_timeout(int timer_ix);

// Millisecond delay
void sys_delay(uint32_t ms_delay);
void sys_delay(uint32_t ms_delay);

// Current systick count
uint32_t sys_tick_count();
Expand Down Expand Up @@ -1001,4 +1005,8 @@ int update_bmp_file_header(FIL* fp, int width, int height, uint32_t bg_color);

#include "lft_ifc.h"

#ifdef __cplusplus
}
#endif // __cplusplus

#endif
11 changes: 9 additions & 2 deletions dmcp/sys/pgm_syscalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


The software and related material is released as “NOMAS” (NOt MAnufacturer Supported).
The software and related material is released as “NOMAS” (NOt MAnufacturer Supported).

1. Info is released to assist customers using, exploring and extending the product
1. Info is released to assist customers using, exploring and the product
2. Do NOT contact the manufacturer with questions, seeking support, etc. regarding
NOMAS material as no support is implied or committed-to by the Manufacturer
3. The Manufacturer may reply and/or update materials if and when needed solely
Expand Down Expand Up @@ -190,3 +190,10 @@ void post_main() {
sys_reset();
}


void __attribute__((__noreturn__)) _exit(int status)
{
set_reset_magic(RUN_DMCP_MAGIC);
sys_reset();
while(1);
}