Skip to content

Commit

Permalink
pkg/flashdb: bump to 2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
benpicco committed Aug 7, 2023
1 parent bb9011c commit c44a8ae
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 54 deletions.
6 changes: 4 additions & 2 deletions pkg/flashdb/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PKG_NAME=flashdb
PKG_URL=https://github.com/armink/FlashDB.git
# 1.1.2
PKG_VERSION=7062902a3e7b6b8a7e8f5886ae242271a0164e05
# 2.0.0
PKG_VERSION=4e5677408256f82d47cd56a6b04605dcee35ed9a
PKG_LICENSE=Apache-2.0

include $(RIOTBASE)/pkg/pkg.mk
Expand All @@ -11,6 +11,8 @@ CFLAGS += -Wno-cast-align
CFLAGS += -Wno-unused
CFLAGS += -Wno-unused-parameter
CFLAGS += -Wno-format
# can be dropped if #226 is merged
CFLAGS += -Wno-sign-compare

.PHONY: flashdb_fal

Expand Down
1 change: 1 addition & 0 deletions pkg/flashdb/Makefile.dep
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# FlashDB is only supported by 32 bit architectures
FEATURES_REQUIRED += arch_32bit
CFLAGS += -DFDB_USING_NATIVE_ASSERT

ifneq (,$(filter flashdb_tsdb,$(USEMODULE)))
CFLAGS += -DFDB_USING_TSDB
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
From 4daeb0a609e6b5bfea608900576109e8d4fa604c Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Date: Mon, 7 Aug 2023 17:23:48 +0200
Subject: [PATCH] [port/fal] add option to use native assert()

---
port/fal/inc/fal_def.h | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/port/fal/inc/fal_def.h b/port/fal/inc/fal_def.h
index f558598..de8aada 100644
--- a/port/fal/inc/fal_def.h
+++ b/port/fal/inc/fal_def.h
@@ -13,6 +13,9 @@

#include <stdint.h>
#include <stdio.h>
+#ifdef FDB_USING_NATIVE_ASSERT
+#include <assert.h>
+#endif

#define FAL_SW_VERSION "0.5.99"

@@ -50,6 +53,7 @@
#endif

#if FAL_DEBUG
+#ifndef FDB_USING_NATIVE_ASSERT
#ifdef assert
#undef assert
#endif
@@ -59,6 +63,7 @@ if (!(EXPR)) \
FAL_PRINTF("(%s) has assert failed at %s.\n", #EXPR, __func__ ); \
while (1); \
}
+#endif

/* debug level log */
#ifdef log_d
@@ -69,10 +74,12 @@ if (!(EXPR)) \

#else

+#ifndef FDB_USING_NATIVE_ASSERT
#ifdef assert
#undef assert
#endif
#define assert(EXPR) ((void)0);
+#endif

/* debug level log */
#ifdef log_d
--
2.39.2

52 changes: 0 additions & 52 deletions pkg/flashdb/patches/0002-remove-assert-definition.patch

This file was deleted.

0 comments on commit c44a8ae

Please sign in to comment.