diff --git a/drivers/spim.c b/drivers/spim.c
new file mode 100644
index 0000000..646876a
--- /dev/null
+++ b/drivers/spim.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 ETH Zurich, University of Bologna
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+* @Author: Alfio Di Mauro
+* @Date:   2020-03-23 09:33:29
+* @Last Modified by:   Alfio Di Mauro
+* @Last Modified time: 2020-03-23 09:38:45
+*/
+
+#include "pulp.h"
+
+#define DEBUG
+
+static void spim_wait_tx_done(int periph)
+{
+	
+  #ifdef DEBUG
+	int periph_id = periph - ARCHI_SPIM_UART_ID(0);
+    printf("periph_id = %d\n", periph_id);
+  #endif
+
+  while (plp_udma_busy(UDMA_SPIM_TX_ADDR(periph - ARCHI_SPIM_UART_ID(0))))
+  {
+  }
+
+  while(plp_uart_tx_busy(periph - ARCHI_UDMA_UART_ID(0)));
+}
+
+
+static void spim_wait_rx_done(int periph)
+{
+  while (plp_udma_busy(UDMA_UART_RX_ADDR(periph - ARCHI_UDMA_UART_ID(0))))
+  {
+  }
+}
\ No newline at end of file
diff --git a/drivers/uart.c b/drivers/uart.c
index 088848c..3ec322b 100644
--- a/drivers/uart.c
+++ b/drivers/uart.c
@@ -16,7 +16,7 @@
 
 #include "pulp.h"
 
-
+//#define DEBUG
 
 #define UART_BAUDRATE 115200
 
@@ -39,8 +39,6 @@ static void uart_wait_rx_done(int periph)
   }
 }
 
-
-
 static void uart_setup(int channel, int baudrate)
 {
   int div =  (PERIPH_FREQUENCY + baudrate/2) / baudrate;
@@ -48,13 +46,15 @@ static void uart_setup(int channel, int baudrate)
   plp_uart_setup(channel - ARCHI_UDMA_UART_ID(0), 0, div-1);
 }
 
-
-
-
 int uart_open(int uart_id, int baudrate)
 {
+
   int periph_id = ARCHI_UDMA_UART_ID(uart_id);
-  int channel = UDMA_EVENT_ID(periph_id);
+  int channel   = UDMA_EVENT_ID(periph_id);
+
+  #ifdef DEBUG
+    printf("periph_id = %d, event = %d\n", periph_id,channel);
+  #endif
 
   plp_udma_cg_set(plp_udma_cg_get() | (1<<periph_id));
 
@@ -66,9 +66,6 @@ int uart_open(int uart_id, int baudrate)
   return 0;
 }
 
-
-
-
 void uart_close(int uart_id)
 {
   int periph_id = ARCHI_UDMA_UART_ID(uart_id);
@@ -82,13 +79,10 @@ void uart_close(int uart_id)
 }
 
 
-
-
-
 int uart_write(int uart_id, void *buffer, uint32_t size)
 {
   int periph_id = ARCHI_UDMA_UART_ID(uart_id);
-  int channel = UDMA_EVENT_ID(periph_id) + 1;
+  int channel = UDMA_CHANNEL_ID(periph_id) + 1;
 
   unsigned int base = hal_udma_channel_base(channel);
 
@@ -100,11 +94,10 @@ int uart_write(int uart_id, void *buffer, uint32_t size)
 }
 
 
-
 int uart_read(int uart_id, void *buffer, uint32_t size)
 {
   int periph_id = ARCHI_UDMA_UART_ID(uart_id);
-  int channel = UDMA_EVENT_ID(periph_id);
+  int channel = UDMA_CHANNEL_ID(periph_id);
 
   unsigned int base = hal_udma_channel_base(channel);
 
diff --git a/include/archi/chips/marsellus/properties.h b/include/archi/chips/marsellus/properties.h
index 9c14167..d3b7bef 100644
--- a/include/archi/chips/marsellus/properties.h
+++ b/include/archi/chips/marsellus/properties.h
@@ -115,26 +115,28 @@
 
 #define ARCHI_UDMA_HAS_SPIM   1
 #define ARCHI_UDMA_HAS_UART   1
-#define ARCHI_UDMA_HAS_SDIO      1
+#define ARCHI_UDMA_HAS_SDIO   1
 #define ARCHI_UDMA_HAS_I2C    1
 #define ARCHI_UDMA_HAS_I2S    1
 #define ARCHI_UDMA_HAS_CAM    1
 #define ARCHI_UDMA_HAS_TRACER 1
-#define ARCHI_UDMA_HAS_FILTER    1
+#define ARCHI_UDMA_HAS_FILTER 1
 
-#define ARCHI_UDMA_NB_SPIM   1
-#define ARCHI_UDMA_NB_UART   1
-#define ARCHI_UDMA_NB_SDIO      1
-#define ARCHI_UDMA_NB_I2C    1
-#define ARCHI_UDMA_NB_I2S    1
+#define ARCHI_UDMA_NB_SPIM   3
+#define ARCHI_UDMA_NB_UART   2
+#define ARCHI_UDMA_NB_I2C    3
+#define ARCHI_UDMA_NB_SDIO   1
+#define ARCHI_UDMA_NB_I2S    2
 #define ARCHI_UDMA_NB_CAM    1
 #define ARCHI_UDMA_NB_TRACER 1
-#define ARCHI_UDMA_NB_FILTER    1
+#define ARCHI_UDMA_NB_FILTER 1
 
-#define ARCHI_UDMA_UART_ID(id)            0
-#define ARCHI_UDMA_SPIM_ID(id)            1
-#define ARCHI_UDMA_I2C_ID(id)             (2 + (id))
-#define ARCHI_UDMA_SDIO_ID(id)            (4   + (id))
+#define ARCHI_UDMA_GEN_PER_ID(id)         (0 + (id))
+#define ARCHI_UDMA_UART_ID(id)            (0 + (id))
+#define ARCHI_UDMA_SPIM_ID(id)            (2 + (id))
+#define ARCHI_UDMA_I2C_ID(id)             (6 + (id))
+
+#define ARCHI_UDMA_SDIO_ID(id)            (4 + (id))
 #define ARCHI_UDMA_I2S_ID(id)             5
 #define ARCHI_UDMA_CAM_ID(id)             6
 #define ARCHI_UDMA_FILTER_ID(id)          (7  + (id))
diff --git a/include/hal/udma/spim/udma_spim_v3.h b/include/hal/udma/spim/udma_spim_v3.h
index 2fc2185..ff8fa2e 100644
--- a/include/hal/udma/spim/udma_spim_v3.h
+++ b/include/hal/udma/spim/udma_spim_v3.h
@@ -25,4 +25,14 @@
 #define UDMA_SPIM_TX_ADDR(id)         (ARCHI_UDMA_ADDR + UDMA_SPIM_OFFSET(id) + 0x10)
 #define UDMA_SPIM_CUSTOM_ADDR(id)     (ARCHI_UDMA_ADDR + UDMA_SPIM_OFFSET(id) + UDMA_CHANNEL_CUSTOM_OFFSET)
 
+static inline unsigned int plp_spim_reg_read(int channel, unsigned int addr)
+{ //adr is an offset, expected SPIM_STATUS_OFFSET or SPIM_SETUP_OFFSET
+  return pulp_read32(ARCHI_UDMA_ADDR + UDMA_SPIM_OFFSET(channel) + UDMA_CHANNEL_CUSTOM_OFFSET + addr);
+}
+
+static inline void plp_spim_reg_write(int channel, unsigned int addr, unsigned int cfg)
+{ //adr is an offset, expected SPIM_STATUS_OFFSET or SPIM_SETUP_OFFSET
+  pulp_write32(ARCHI_UDMA_ADDR + UDMA_SPIM_OFFSET(channel) + UDMA_CHANNEL_CUSTOM_OFFSET + addr, cfg);
+}
+
 #endif