Skip to content

Commit

Permalink
Clang-format fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@pguyot
pguyot committed Jul 2, 2023
1 parent 2aa31e3 commit fbcbece
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 117 deletions.
76 changes: 38 additions & 38 deletions nifs/atomvm_m5.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#define MAKE_ATOM(ctx, len, str) globalcontext_make_atom(ctx->global, ATOM_STR(len, str))
//#define MAKE_ATOM(ctx, len, str) context_make_atom(ctx, ATOM_STR(len, str))

static term nif_begin(Context *ctx, int argc, term argv[])
static term nif_begin(Context* ctx, int argc, term argv[])
{
UNUSED(argc);
VALIDATE_VALUE(argv[0], term_is_list);
Expand All @@ -59,50 +59,50 @@ static term nif_begin(Context *ctx, int argc, term argv[])
return OK_ATOM;
}

static term nif_get_board(Context *ctx, int argc, term argv[])
static term nif_get_board(Context* ctx, int argc, term argv[])
{
UNUSED(argc);

switch (M5.getBoard()) {
#if defined(CONFIG_IDF_TARGET_ESP32C3)
case m5::board_t::board_M5StampC3:
return MAKE_ATOM(ctx, "\x8", "stamp_c3");
case m5::board_t::board_M5StampC3U:
return MAKE_ATOM(ctx, "\x9", "stamp_c3u");
case m5::board_t::board_M5StampC3:
return MAKE_ATOM(ctx, "\x8", "stamp_c3");
case m5::board_t::board_M5StampC3U:
return MAKE_ATOM(ctx, "\x9", "stamp_c3u");
#else
case m5::board_t::board_M5Stack:
return MAKE_ATOM(ctx, "\x5", "stack");
case m5::board_t::board_M5StackCore2:
return MAKE_ATOM(ctx, "\xB", "stack_core2");
case m5::board_t::board_M5StickC:
return MAKE_ATOM(ctx, "\x7", "stick_c");
case m5::board_t::board_M5StickCPlus:
return MAKE_ATOM(ctx, "\xB", "stick_cplus");
case m5::board_t::board_M5StackCoreInk:
return MAKE_ATOM(ctx, "\x8", "core_ink");
case m5::board_t::board_M5Paper:
return MAKE_ATOM(ctx, "\x5", "paper");
case m5::board_t::board_M5Tough:
return MAKE_ATOM(ctx, "\x5", "tough");
case m5::board_t::board_M5Station:
return MAKE_ATOM(ctx, "\x7", "station");
case m5::board_t::board_M5Atom:
return MAKE_ATOM(ctx, "\x4", "atom");
case m5::board_t::board_M5AtomPsram:
return MAKE_ATOM(ctx, "\xA", "atom_psram");
case m5::board_t::board_M5AtomU:
return MAKE_ATOM(ctx, "\x6", "atom_u");
case m5::board_t::board_M5TimerCam:
return MAKE_ATOM(ctx, "\xC", "timer_camera");
case m5::board_t::board_M5StampPico:
return MAKE_ATOM(ctx, "\xA", "stamp_pico");
case m5::board_t::board_M5Stack:
return MAKE_ATOM(ctx, "\x5", "stack");
case m5::board_t::board_M5StackCore2:
return MAKE_ATOM(ctx, "\xB", "stack_core2");
case m5::board_t::board_M5StickC:
return MAKE_ATOM(ctx, "\x7", "stick_c");
case m5::board_t::board_M5StickCPlus:
return MAKE_ATOM(ctx, "\xB", "stick_cplus");
case m5::board_t::board_M5StackCoreInk:
return MAKE_ATOM(ctx, "\x8", "core_ink");
case m5::board_t::board_M5Paper:
return MAKE_ATOM(ctx, "\x5", "paper");
case m5::board_t::board_M5Tough:
return MAKE_ATOM(ctx, "\x5", "tough");
case m5::board_t::board_M5Station:
return MAKE_ATOM(ctx, "\x7", "station");
case m5::board_t::board_M5Atom:
return MAKE_ATOM(ctx, "\x4", "atom");
case m5::board_t::board_M5AtomPsram:
return MAKE_ATOM(ctx, "\xA", "atom_psram");
case m5::board_t::board_M5AtomU:
return MAKE_ATOM(ctx, "\x6", "atom_u");
case m5::board_t::board_M5TimerCam:
return MAKE_ATOM(ctx, "\xC", "timer_camera");
case m5::board_t::board_M5StampPico:
return MAKE_ATOM(ctx, "\xA", "stamp_pico");
#endif
default:
return UNDEFINED_ATOM;
default:
return UNDEFINED_ATOM;
}
}

static term nif_update(Context *ctx, int argc, term argv[])
static term nif_update(Context* ctx, int argc, term argv[])
{
UNUSED(argc);
UNUSED(argv);
Expand All @@ -111,7 +111,7 @@ static term nif_update(Context *ctx, int argc, term argv[])
return OK_ATOM;
}

static constexpr std::array<std::pair<const char *, const struct Nif>, 3> NIFS = { {
static constexpr std::array<std::pair<const char*, const struct Nif>, 3> NIFS = { {
{ "begin_/1", { { NIFFunctionType }, nif_begin } },
{ "get_board/0", { { NIFFunctionType }, nif_get_board } },
{ "update/0", { { NIFFunctionType }, nif_update } },
Expand All @@ -121,12 +121,12 @@ static constexpr std::array<std::pair<const char *, const struct Nif>, 3> NIFS =
// Component Nif Entrypoints
//

static const struct Nif *get_nif(const char *nifname)
static const struct Nif* get_nif(const char* nifname)
{
if (memcmp(nifname, MODULE_PREFIX, strlen(MODULE_PREFIX))) {
return NULL;
}
for (const auto &nif : NIFS) {
for (const auto& nif : NIFS) {
if (strcmp(nif.first, nifname + strlen(MODULE_PREFIX)) == 0) {
return &nif.second;
}
Expand Down
18 changes: 9 additions & 9 deletions nifs/atomvm_m5_i2c.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,40 @@

#define MAKE_ATOM(ctx, len, str) globalcontext_make_atom(ctx->global, ATOM_STR(len, str))

static term nif_in_i2c_set_port(Context *ctx, int argc, term argv[])
static term nif_in_i2c_set_port(Context* ctx, int argc, term argv[])
{
UNUSED(argc);
M5.In_I2C.setPort(term_to_int32(argv[0]), term_to_int32(argv[1]), term_to_int32(argv[2]));
return OK_ATOM;
}

static term nif_ex_i2c_set_port(Context *ctx, int argc, term argv[])
static term nif_ex_i2c_set_port(Context* ctx, int argc, term argv[])
{
UNUSED(argc);
M5.Ex_I2C.setPort(term_to_int32(argv[0]), term_to_int32(argv[1]), term_to_int32(argv[2]));
return OK_ATOM;
}

static term nif_in_i2c_begin(Context *ctx, int argc, term argv[])
static term nif_in_i2c_begin(Context* ctx, int argc, term argv[])
{
UNUSED(argc);
bool result = M5.In_I2C.begin(term_to_int32(argv[0]), term_to_int32(argv[1]), term_to_int32(argv[2]));
return result ? TRUE_ATOM : FALSE_ATOM;
}

static term nif_ex_i2c_begin(Context *ctx, int argc, term argv[])
static term nif_ex_i2c_begin(Context* ctx, int argc, term argv[])
{
UNUSED(argc);
bool result = M5.Ex_I2C.begin(term_to_int32(argv[0]), term_to_int32(argv[1]), term_to_int32(argv[2]));
return result ? TRUE_ATOM : FALSE_ATOM;
}

static constexpr std::array<std::pair<const char *, const struct Nif>, 2> IN_NIFS = { {
static constexpr std::array<std::pair<const char*, const struct Nif>, 2> IN_NIFS = { {
{ "set_port/3", { { NIFFunctionType }, nif_in_i2c_set_port } },
{ "begin_/3", { { NIFFunctionType }, nif_in_i2c_begin } },
} };

static constexpr std::array<std::pair<const char *, const struct Nif>, 2> EX_NIFS = { {
static constexpr std::array<std::pair<const char*, const struct Nif>, 2> EX_NIFS = { {
{ "set_port/3", { { NIFFunctionType }, nif_ex_i2c_set_port } },
{ "begin_/3", { { NIFFunctionType }, nif_ex_i2c_begin } },
} };
Expand All @@ -75,16 +75,16 @@ static constexpr std::array<std::pair<const char *, const struct Nif>, 2> EX_NIF
// Component Nif Entrypoints
//

static const struct Nif *get_nif(const char *nifname)
static const struct Nif* get_nif(const char* nifname)
{
if (memcmp(nifname, MODULE_IN_PREFIX, strlen(MODULE_IN_PREFIX)) == 0) {
for (const auto &nif : IN_NIFS) {
for (const auto& nif : IN_NIFS) {
if (strcmp(nif.first, nifname + strlen(MODULE_IN_PREFIX)) == 0) {
return &nif.second;
}
}
} else if (memcmp(nifname, MODULE_EX_PREFIX, strlen(MODULE_EX_PREFIX)) == 0) {
for (const auto &nif : EX_NIFS) {
for (const auto& nif : EX_NIFS) {
if (strcmp(nif.first, nifname + strlen(MODULE_EX_PREFIX)) == 0) {
return &nif.second;
}
Expand Down
32 changes: 16 additions & 16 deletions nifs/atomvm_m5_nifs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Common macros to simplify glue
#define M5_NIF_v_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
UNUSED(argc); \
UNUSED(argv); \
Expand All @@ -11,14 +11,14 @@
}

#define M5_NIF_v_i(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
UNUSED(argc); \
return term_from_int(M5.module.api_func()); \
}

#define M5_NIF_i_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
UNUSED(argc); \
VALIDATE_VALUE(argv[0], term_is_integer); \
Expand All @@ -28,7 +28,7 @@
}

#define M5_NIF_i2_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
UNUSED(argc); \
VALIDATE_VALUE(argv[0], term_is_integer); \
Expand All @@ -39,8 +39,8 @@
return OK_ATOM; \
}

#define M5_NIF_i3_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
#define M5_NIF_i3_v(name, module, api_func) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
UNUSED(argc); \
VALIDATE_VALUE(argv[0], term_is_integer); \
Expand All @@ -53,8 +53,8 @@
return OK_ATOM; \
}

#define M5_NIF_i2_i3_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
#define M5_NIF_i2_i3_v(name, module, api_func) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
for (int i = 0; i < argc; i++) { \
VALIDATE_VALUE(argv[i], term_is_integer); \
Expand All @@ -71,8 +71,8 @@
} \
return OK_ATOM; \
}
#define M5_NIF_i3_i4_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
#define M5_NIF_i3_i4_v(name, module, api_func) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
for (int i = 0; i < argc; i++) { \
VALIDATE_VALUE(argv[i], term_is_integer); \
Expand All @@ -92,8 +92,8 @@
return OK_ATOM; \
}

#define M5_NIF_i4_i5_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
#define M5_NIF_i4_i5_v(name, module, api_func) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
for (int i = 0; i < argc; i++) { \
VALIDATE_VALUE(argv[i], term_is_integer); \
Expand All @@ -115,8 +115,8 @@
return OK_ATOM; \
}

#define M5_NIF_i5_i6_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
#define M5_NIF_i5_i6_v(name, module, api_func) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
for (int i = 0; i < argc; i++) { \
VALIDATE_VALUE(argv[i], term_is_integer); \
Expand All @@ -140,8 +140,8 @@
return OK_ATOM; \
}

#define M5_NIF_i6_i7_v(name, module, api_func) \
static term name(Context *ctx, int argc, term argv[]) \
#define M5_NIF_i6_i7_v(name, module, api_func) \
static term name(Context* ctx, int argc, term argv[]) \
{ \
for (int i = 0; i < argc; i++) { \
VALIDATE_VALUE(argv[i], term_is_integer); \
Expand Down
Loading

0 comments on commit fbcbece

Please sign in to comment.