libseven: fix spi_clock definition

LunarLambda · Feb 2, 2023 · 7a2be84 · 7a2be84
1 parent 7dd4012
commit 7a2be84
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/dist.sh b/dist.sh
@@ -12,5 +12,5 @@ make_dist() {
 
 [ ! -d "$DIST" ] && mkdir "$DIST" || rm "$DIST"/*
 
-(PROJECT=libseven VERSION=0.15.0 make_dist)
+(PROJECT=libseven VERSION=0.15.1 make_dist)
 (PROJECT=minrt VERSION=0.5.1 make_dist)
diff --git a/libseven/include/seven/base/version.h b/libseven/include/seven/base/version.h
@@ -11,7 +11,7 @@
 
 #define LIBSEVEN_VERSION_MAJOR 0
 #define LIBSEVEN_VERSION_MINOR 15
-#define LIBSEVEN_VERSION_PATCH 0
+#define LIBSEVEN_VERSION_PATCH 1
 
 #define LIBSEVEN_VERSION \
     _LIBSEVEN_STR2(LIBSEVEN_VERSION_MAJOR) "." \

diff --git a/libseven/include/seven/hw/serial/spi.h b/libseven/include/seven/hw/serial/spi.h
@@ -16,6 +16,8 @@ enum SerialControlSPI
     #define BF_SPI_CLOCK_OFFSET 0
     #define BF_SPI_CLOCK_LENGTH 2
 
+    #define SPI_CLOCK(n) BITFIELD(SPI_CLOCK, (n))
+
     SPI_CLOCK_EXTERNAL = SPI_CLOCK(0),
     SPI_CLOCK_256KHZ = SPI_CLOCK(1),
     SPI_CLOCK_2MHZ = SPI_CLOCK(3),

diff --git a/libseven/meson.build b/libseven/meson.build
@@ -1,4 +1,4 @@
-version = '0.15.0'
+version = '0.15.1'
 
 sources = [
   'src/hw/bios.s',

diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('sdk-seven', 'c',
-  version: '0.15.0',
+  version: '0.15.1',
   license: 'Zlib',
   meson_version: '>=0.55.0',
   default_options: ['warning_level=2', 'c_std=c99'])