static cast with proper function signature, BIOS::LCD::BufferWrite

gabonator · Aug 9, 2023 · da455c4 · da455c4
1 parent f69c6fe
commit da455c4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/system/apps/79_cc1101osc/source/rpc.h b/system/apps/79_cc1101osc/source/rpc.h
@@ -55,7 +55,7 @@ namespace RPC
     if (strcmp(command, "LCD::BufferBegin")==0)
       return (uint32_t)static_cast<void(*)(CRect const&)>(BIOS::LCD::BufferBegin);
     if (strcmp(command, "LCD::BufferWrite")==0)
-      return (uint32_t)static_cast<void(*)(unsigned short*, int)>(BIOS::LCD::BufferWrite);
+      return (uint32_t)static_cast<void(*)(const unsigned short*, int)>(BIOS::LCD::BufferWrite);
     if (strcmp(command, "LCD::Background")==0)
       return (uint32_t)static_cast<void(*)(CRect const&, uint32_t, uint32_t)>(GUI::Background);
     if (strcmp(command, "LCD::Bar")==0)

diff --git a/system/apps/test70_webusb/source/rpc.h b/system/apps/test70_webusb/source/rpc.h
@@ -30,7 +30,7 @@ namespace RPC
     if (strcmp(command, "LCD::BufferBegin")==0)
       return (uint32_t)static_cast<void(*)(CRect const&)>(BIOS::LCD::BufferBegin);
     if (strcmp(command, "LCD::BufferWrite")==0)
-      return (uint32_t)static_cast<void(*)(unsigned short*, int)>(BIOS::LCD::BufferWrite);
+      return (uint32_t)static_cast<void(*)(const unsigned short*, int)>(BIOS::LCD::BufferWrite);
     if (strcmp(command, "LCD::Background")==0)
       return (uint32_t)static_cast<void(*)(CRect const&, uint32_t, uint32_t)>(GUI::Background);
     if (strcmp(command, "LCD::Bar")==0)

diff --git a/system/apps_experiments/test68_webusb/source/rpc.h b/system/apps_experiments/test68_webusb/source/rpc.h
@@ -103,7 +103,7 @@ SPI::write(p, 32);
     if (strcmp(command, "LCD::BufferBegin")==0)
       return (uint32_t)(uint32_t)static_cast<void(*)(CRect const&)>(BIOS::LCD::BufferBegin);
     if (strcmp(command, "LCD::BufferWrite")==0)
-      return (uint32_t)static_cast<void(*)(unsigned short*, int)>(BIOS::LCD::BufferWrite);
+      return (uint32_t)static_cast<void(*)(const unsigned short*, int)>(BIOS::LCD::BufferWrite);
 
     return 0;
   }

diff --git a/system/apps_featured/117_gabuino/source/rpc.h b/system/apps_featured/117_gabuino/source/rpc.h
@@ -44,7 +44,7 @@ namespace RPC
     if (strcmp(command, "LCD::BufferBegin")==0)
       return (uint32_t)static_cast<void(*)(CRect const&)>(BIOS::LCD::BufferBegin);
     if (strcmp(command, "LCD::BufferWrite")==0)
-      return (uint32_t)static_cast<void(*)(unsigned short*, int)>(BIOS::LCD::BufferWrite);
+      return (uint32_t)static_cast<void(*)(const unsigned short*, int)>(BIOS::LCD::BufferWrite);
     if (strcmp(command, "LCD::Background")==0)
       return (uint32_t)static_cast<void(*)(CRect const&, uint32_t, uint32_t)>(GUI::Background);
     if (strcmp(command, "LCD::Bar")==0)

diff --git a/system/os_host/source/framework/BufferedIo.h b/system/os_host/source/framework/BufferedIo.h
@@ -215,6 +215,14 @@ class CBufferedWriter : public CSerialize
 		*this << CStream(dwData);
 		return *this;
 	}
+
+	virtual CBufferedWriter& operator <<( char c )
+	{
+		char buf[2];
+		buf[0] = c; buf[1] = 0;
+		*this << CStream(buf);
+		return *this;
+	}
 
 	virtual CBufferedWriter& operator <<( const CStream& stream_ )
 	{