More ZPU2.0 fixes

Author: alvieboy

hardware/zpuino/zpu/cores/zpuino/HardwareSerial.cpp

@@ -2,32 +2,12 @@
 
 HardwareSerial Serial(1); /* 1st instance/slot */
 
-#ifdef ZPU15
-
-void HardwareSerial::begin_slow(const unsigned int baudrate) {
-	REG(1) = BAUDRATEGEN(baudrate)|BIT(UARTEN);
-}
-
-void HardwareSerial::flush() {
-	while (REG(1) & 4);
-}
-
-size_t HardwareSerial::write(unsigned char c) {
-	while ((REG(1) & 2)==2);
-	REG(0) = c;
-	return 1;
-}
-
-#else
-
 void HardwareSerial::begin_slow(const unsigned int baudrate) {
 	 REGISTER(ioslot,1) = BAUDRATEGEN(baudrate)|BIT(UARTEN);
 }
 
 size_t HardwareSerial::write(unsigned char c) {
 	while ((REGISTER(ioslot,1) & 2)==2);
 	REGISTER(ioslot,0) = c;
+        return 1;
 }
-
-
-#endif

hardware/zpuino/zpu/cores/zpuino/HardwareSerial.h

@@ -6,57 +6,6 @@
 #include "Stream.h"
 #include "Print.h"
 
-#ifdef ZPU15
-#include "BaseDevice.h"
-
-#define VENDOR_ZPUINO       0x08
-#define PRODUCT_ZPUINO_UART 0x11
-
-namespace ZPUino {
-};
-
-class HardwareSerial: public ZPUino::BaseDevice, public Stream
-{
-private:
-public:
-	HardwareSerial(uint8_t instance=0xff): BaseDevice(instance) {}
-
-	__attribute__((always_inline)) inline void begin(const unsigned int baudrate) {
-		if (deviceBegin(VENDOR_ZPUINO, PRODUCT_ZPUINO_UART)==0) {
-			if (__builtin_constant_p(baudrate)) {
-				REG(1) = BAUDRATEGEN(baudrate) | BIT(UARTEN);
-			} else {
-				begin_slow(baudrate);
-			}
-		}
-	}
-	void begin_slow(const unsigned int baudrate);
-
-	int available(void) {
-		return (REG(1) & 1);
-	}
-
-	virtual int read(void) {
-		return REG(0);
-	}
-
-	virtual void flush(void);
-
-	size_t write(uint8_t c);
-
-	virtual int peek() { return -1; }
-
-	using Print::write; // pull in write(str) and write(buf, size) from Print
-private:
-	unsigned int ioslot;
-};
-
-extern void serialEventRun(void) __attribute__((weak));
-
-extern HardwareSerial Serial; /* 1st slot */
-extern HardwareSerial Serial1; /* 1st slot */
-
-#else
 class HardwareSerial: public Stream
 {
 private:
@@ -94,6 +43,5 @@ class HardwareSerial: public Stream
 extern void serialEventRun(void) __attribute__((weak));
 
 extern HardwareSerial Serial; /* 1st slot */
-#endif
 
 #endif

hardware/zpuino/zpu/cores/zpuino/register.h

@@ -31,14 +31,8 @@ typedef volatile unsigned int* register_t;
 
 #define REGISTER(SLOT, y) *(volatile unsigned int*)(SLOT + (y<<2))
 
-#ifndef ZPU15
 #define SPIBASE  IO_SLOT(0)
 #define INTRBASE IO_SLOT(4)
-#else
-#define SPIBASE  IO_SLOT(4)
-#define INTRBASE IO_SLOT(0)
-#define SYSCTLBASE INTRBASE
-#endif
 
 #define UARTBASE IO_SLOT(1)
 #define GPIOBASE IO_SLOT(2)

hardware/zpuino/zpu20/boards.txt

@@ -1,5 +1,6 @@
 ##############################################################
-zpuino15_papilio_one500.name=ZPUino 1.5 on Papilio One (500) board
+zpuino15_papilio_one500.name=ZPUino 2.0 on Papilio One (500) board
+zpuino15_papilio_one500.boardid=0xa5010f00
 zpuino15_papilio_one500.upload.protocol=zpuino-serial
 zpuino15_papilio_one500.upload.maximum_size=27648
 zpuino15_papilio_one500.upload.size_sections=all
@@ -11,5 +12,5 @@ zpuino15_papilio_one500.build.mcu=zpu
 zpuino15_papilio_one500.build.ldscript=zpuelf.lds
 zpuino15_papilio_one500.build.pins=standard
 zpuino15_papilio_one500.build.toolchain=zpu
-zpuino15_papilio_one500.build.extra_flags=-D__ZPUINO_PAPILIO_ONE__ -DZPU15 -DBOARD_ID=0xA5010F00 -DBOARD_MEMORYSIZE=0x8000 -D__S3E_500__ -nostartfiles
-zpuino15_papilio_one500.build.extraSflags=-DBOARD_ID=0xA5010F00 -DZPU15
+zpuino15_papilio_one500.build.extra_flags=-D__ZPUINO_PAPILIO_ONE__ -DZPU20 -DBOARD_ID=0xA5010F00 -DBOARD_MEMORYSIZE=0x8000 -D__S3E_500__ -nostartfiles
+zpuino15_papilio_one500.build.extraSflags=-DBOARD_ID=0xA5010F00 -DZPU20

hardware/zpuino/zpu20/cores/zpuino/HardwareSerial.cpp

@@ -2,8 +2,6 @@
 
 HardwareSerial Serial(1); /* 1st instance/slot */
 
-#ifdef ZPU15
-
 void HardwareSerial::begin_slow(const unsigned int baudrate) {
 	REG(1) = BAUDRATEGEN(baudrate)|BIT(UARTEN);
 }
@@ -17,17 +15,3 @@ size_t HardwareSerial::write(unsigned char c) {
 	REG(0) = c;
 	return 1;
 }
-
-#else
-
-void HardwareSerial::begin_slow(const unsigned int baudrate) {
-	 REGISTER(ioslot,1) = BAUDRATEGEN(baudrate)|BIT(UARTEN);
-}
-
-size_t HardwareSerial::write(unsigned char c) {
-	while ((REGISTER(ioslot,1) & 2)==2);
-	REGISTER(ioslot,0) = c;
-}
-
-
-#endif

hardware/zpuino/zpu20/cores/zpuino/HardwareSerial.h

@@ -5,8 +5,6 @@
 #include <zpuino-types.h>
 #include "Stream.h"
 #include "Print.h"
-
-#ifdef ZPU15
 #include "BaseDevice.h"
 
 #define VENDOR_ZPUINO       0x08
@@ -56,44 +54,4 @@ extern void serialEventRun(void) __attribute__((weak));
 extern HardwareSerial Serial; /* 1st slot */
 extern HardwareSerial Serial1; /* 1st slot */
 
-#else
-class HardwareSerial: public Stream
-{
-private:
-public:
-	HardwareSerial(unsigned int b): ioslot(IO_SLOT(b)) {}
-
-	__attribute__((always_inline)) inline void begin(const unsigned int baudrate) {
-		if (__builtin_constant_p(baudrate)) {
-			REGISTER(ioslot,1) = BAUDRATEGEN(baudrate) | BIT(UARTEN);
-		} else {
-			begin_slow(baudrate);
-		}
-	}
-	void begin_slow(const unsigned int baudrate);
-
-	int available(void) {
-		return (REGISTER(ioslot,1) & 1);
-	}
-
-	virtual int read(void) {
-		return REGISTER(ioslot,0);
-	}
-
-	virtual void flush(void) {};
-
-	size_t write(uint8_t c);
-
-	virtual int peek() { return -1; }
-
-	using Print::write; // pull in write(str) and write(buf, size) from Print
-private:
-	unsigned int ioslot;
-};
-
-extern void serialEventRun(void) __attribute__((weak));
-
-extern HardwareSerial Serial; /* 1st slot */
-#endif
-
 #endif

hardware/zpuino/zpu20/cores/zpuino/register.h

@@ -31,14 +31,9 @@ typedef volatile unsigned int* register_t;
 
 #define REGISTER(SLOT, y) *(volatile unsigned int*)(SLOT + (y<<2))
 
-#ifndef ZPU15
-#define SPIBASE  IO_SLOT(0)
-#define INTRBASE IO_SLOT(4)
-#else
 #define SPIBASE  IO_SLOT(4)
 #define INTRBASE IO_SLOT(0)
 #define SYSCTLBASE INTRBASE
-#endif
 
 #define UARTBASE IO_SLOT(1)
 #define GPIOBASE IO_SLOT(2)