Merge pull request cnlohr#838 from biemster/ch5xx-flashlib

CH5xx: add flash library and flashtest demo

Author: cnlohr

ch32fun/ch5xxhw.h

@@ -810,11 +810,7 @@ typedef enum
 #define  RB_ROM_CODE_OFS    0x10                      // RWA, code offset address selection in Flash ROM: 0=start address 0x000000, 1=start address 0x040000
 #define  RB_ROM_CTRL_EN     0x20                      // RWA, enable flash ROM control interface enable: 0=disable access, 1=enable access control register
 #define  RB_ROM_DATA_WE     0x40                      // RWA, enable flash ROM data & code area being erase/write: 0=all writing protect, 1=enable data area program and erase
-#ifdef CH570_CH572
 #define  RB_ROM_CODE_WE     0xC0                      // RWA, enable flash ROM code area being erase/write: 0=code writing protect, 1=enable code area program and erase
-#else
-#define  RB_ROM_CODE_WE     0x80                      // RWA, enable flash ROM code area being erase/write: 0=code writing protect, 1=enable code area program and erase
-#endif
 #define R8_GLOB_CFG_INFO    (*((vu8*)0x40001045))     // RO, global configuration information and status
 #define  RB_CFG_ROM_READ    0x01                      // RO, indicate protected status of Flash ROM code and data: 0=reading protect, 1=enable read by external programmer
 #define  RB_CFG_RESET_EN    0x04                      // RO, manual reset input enable status

examples_ch5xx/flashtest/Makefile

@@ -0,0 +1,10 @@
+all : flash
+
+TARGET:=flashtest
+TARGET_MCU:=CH570
+TARGET_MCU_PACKAGE:=CH570D
+
+include ../../ch32fun/ch32fun.mk
+
+flash : cv_flash
+clean : cv_clean

examples_ch5xx/flashtest/flashtest.c

@@ -0,0 +1,79 @@
+/*
+  Flash read and write demo for ch5xx
+
+  The flash on ch5xx is accessed through some funny flash controller,
+  a library to talk to that is implemented in extralibs/ch5xx_flash.h
+  Some functions in that library, and the user function must be run
+  from RAM otherwise the chip locks up.
+  By default these are automatically and always loaded into RAM which
+  takes about 480 bytes of it, but it's possible to load them on demand
+  into a special RAM section by using FUNCONF_CH5XXFLASHLIB_SECTION.
+  The top comment in extralibs/ch5xx_flash.h explains how to do that.
+
+  IMPORTANT NOTE ON ERASE:
+  Flash erase is done in Sectors of 4kB, when you want to write something
+  to flash you first need to erase the sector it is on.
+  The ch5xx_flash_cmd_erase(addr, len) function takes care of aligning
+  the start and end addresses to sector boundaries, so it will erase
+  more than just [addr, addr+len]!
+*/
+
+#include <stdio.h>
+#include "ch32fun.h"
+#include "ch5xx_flash.h"
+
+#define SECTOR_SIZE     4096 // 4kB
+#define SOMETHING_NICE "ch32fun"
+
+uint8_t buf_compare[] = SOMETHING_NICE;
+uint8_t buf[] = SOMETHING_NICE;
+int check_buffers() {
+	int result = 1;
+	for(int i = 0; i < sizeof(buf); i++) {
+		printf("%02x ", buf[i]);
+		if(buf[i] != buf_compare[i]) {
+			result = 0;
+		}
+	}
+	printf("\n");
+	return result;
+}
+
+__HIGH_CODE
+void flashtest() {
+	// init and empty buffer
+	for(int i = 0; i < sizeof(buf); i++) {
+		buf[i] = 0;
+	}
+
+	// read start of third sector
+	uint32_t addr = 2*SECTOR_SIZE;
+	uint32_t len = sizeof(buf);
+	ch5xx_flash_cmd_read(addr, buf, len);
+	int check1 = check_buffers();
+
+	// erase third sector
+	ch5xx_flash_cmd_erase(addr, len);
+	ch5xx_flash_cmd_read(addr, buf, len);
+	int check2 = check_buffers();
+
+	// write something nice to the start of the third sector and verify the write
+	ch5xx_flash_cmd_write(addr, buf_compare, sizeof(buf));
+	int verify = ch5xx_flash_cmd_verify(addr, buf_compare, sizeof(buf));
+
+	// read it back
+	ch5xx_flash_cmd_read(addr, buf, len);
+	int check3 = check_buffers();
+
+	printf("flashtest: the first check will be false only on first run, second is always false and third is always true\n");
+	printf("checks: chk1:%d chk2:%d verify(%d):%d chk3:%d\n", check1, check2, sizeof(buf), verify, check3);
+}
+
+int main()
+{
+	SystemInit();
+
+	flashtest(); // must run from RAM
+
+	while(1);
+}

examples_ch5xx/flashtest/funconfig.h

@@ -0,0 +1,12 @@
+#ifndef _FUNCONFIG_H
+#define _FUNCONFIG_H
+
+#define FUNCONF_USE_HSI           0 // CH592 does not have HSI
+#define FUNCONF_USE_HSE           1
+#define CLK_SOURCE_CH5XX          CLK_SOURCE_PLL_60MHz // default so not really needed
+#define FUNCONF_SYSTEM_CORE_CLOCK 60 * 1000 * 1000     // keep in line with CLK_SOURCE_CH59X
+
+#define FUNCONF_DEBUG_HARDFAULT   1
+#define FUNCONF_USE_CLK_SEC       0
+
+#endif