Merge 'upstream/master' - At least it builds...

firmware/chibios-portapack/os/hal/platforms/LPC43xx_M4/lpc43xx_m4.h

@@ -125,12 +125,6 @@ typedef enum IRQn {
 
 #ifdef __cplusplus
 
-/* NOTE: Override old, misbehaving SIMD #defines */
-
-#define __SIMD32_TYPE int32_t
-#define __SIMD32(addr)  (*(__SIMD32_TYPE **) & (addr))
-#define _SIMD32_OFFSET(addr)  (*(__SIMD32_TYPE *)  (addr))
-
 /* Overload of __SXTB16() to add ROR argument, since using __ROR() as an
  * argument to the existing __SXTB16() doesn't produce optimum/sane code.
  */
@@ -196,6 +190,20 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE int32_t __SMULTT(uint32_t op1
   return result;
 }
 
+#undef __SMULL
+
+__attribute__( ( always_inline ) ) static inline int64_t __SMULL (int32_t op1, int32_t op2)
+{
+  union llreg_u{
+    uint32_t w32[2];
+    int64_t w64;
+  } llr;
+
+  __asm volatile ("smull %0, %1, %2, %3" : "=r" (llr.w32[0]), "=r" (llr.w32[1]): "r" (op1), "r" (op2));
+
+  return(llr.w64);
+}
+
 #undef __SMLALD
 
 __attribute__( ( always_inline ) ) static inline int64_t __SMLALD (uint32_t op1, uint32_t op2, int64_t acc)

firmware/chibios-portapack/os/various/fatfs_bindings/fatfs.cmake

@@ -3,6 +3,7 @@ set(FATFSSRC
 	${CHIBIOS_PORTAPACK}/os/various/fatfs_bindings/fatfs_diskio.c
 	${CHIBIOS_PORTAPACK}/os/various/fatfs_bindings/fatfs_syscall.c
 	${CHIBIOS_PORTAPACK}/ext/fatfs/src/ff.c
+	${CHIBIOS_PORTAPACK}/ext/fatfs/src/option/unicode.c
 )
 
 set(FATFSINC

firmware/chibios-portapack/os/various/fatfs_bindings/fatfs_diskio.c

@@ -153,7 +153,6 @@ DRESULT disk_read (
 /* Write Sector(s)                                                       */
 /*-----------------------------------------------------------------------*/
 
-#if _USE_WRITE
 DRESULT disk_write (
   BYTE pdrv,      /* Physical drive nmuber to identify the drive */
   const BYTE *buff, /* Data to be written */
@@ -190,7 +189,6 @@ DRESULT disk_write (
   }
   return RES_PARERR;
 }
-#endif /* _READONLY */
 
 
 
@@ -198,7 +196,6 @@ DRESULT disk_write (
 /* Miscellaneous Functions                                               */
 /*-----------------------------------------------------------------------*/
 
-#if _USE_IOCTL
 DRESULT disk_ioctl (
   BYTE pdrv,    /* Physical drive nmuber (0..) */
   BYTE cmd,     /* Control code */
@@ -260,7 +257,6 @@ DRESULT disk_ioctl (
   }
   return RES_PARERR;
 }
-#endif /* _IOCTL */
 
 DWORD get_fattime(void) {
 #if HAL_USE_RTC