Commit: 8 - console8xx (svn)

LPC8xx用シリアルコンソール

Commit MetaInfo

• Revision: 8 (tree)
• Time: 2018-04-10 03:49:26
• Author: kmorimatsu

Log Message

Update trunk

Change Summary

• modified: trunk/config.h
• modified: trunk/prototypes.h
• modified: trunk/ps2.c
• modified: trunk/uart.c

Incremental Difference

--- trunk/config.h	(revision 7)
+++ trunk/config.h	(revision 8)
@@ -6,7 +6,7 @@
 */
 
 /*
- * 'vsyncture' is set to get proper video signal construction frequency.
+ * 'vsynctune' is set to get proper video signal construction frequency.
  * -4 <= vsynctune <= 4
  * After setting proper value, signal frequency of Pin #3 will be 16275 Hz.
  *
@@ -21,3 +21,11 @@
 
 #define KEYBOARD101
 //#define KEYBOARD106
+
+/*
+ * Baud rate definition
+ * (experimental and not tested)
+ *
+ */
+
+#define BAUDRATE 9600

--- trunk/prototypes.h	(revision 7)
+++ trunk/prototypes.h	(revision 8)
@@ -3,7 +3,7 @@
 extern const unsigned char cgrom[];
 
 void ntsc_init(void);
-volatile int g_videoline;
+extern volatile int g_videoline;
 
 inline void check_ps2(void);
 inline void completed_ps2(void);

--- trunk/ps2.c	(revision 7)
+++ trunk/ps2.c	(revision 8)
@@ -127,8 +127,8 @@
 		0x00,0x63,0x78,0x64,0x65,0x34,0x33,0x00,0x00,0x20,0x76,0x66,0x74,0x72,0x35,0x00,
 		0x00,0x6e,0x62,0x68,0x67,0x79,0x36,0x00,0x00,0x00,0x6d,0x6a,0x75,0x37,0x38,0x00,
 		0x00,0x2c,0x6b,0x69,0x6f,0x30,0x39,0x00,0x00,0x2e,0x2f,0x6c,0x3b,0x70,0x2d,0x00,
-		0x00,0x00,0x3a,0x00,0x40,0x5e,0x00,0x00,0x00,0x00,0x0a,0x5b,0x00,0x5d,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x00,
+		0x00,0x5c,0x3a,0x00,0x40,0x5e,0x00,0x00,0x00,0x00,0x0a,0x5b,0x00,0x5d,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x5c,0x11,0x00,0x00,0x00,0x00,
 		0x00,0x7f,0x14,0x00,0x13,0x12,0x1b,0x00,0x00,0x2b,0x00,0x2d,0x2a,0x00,0x00,0x00,
 		// Shift key down
 		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x09,0x7e,0x00,
@@ -135,9 +135,9 @@
 		0x00,0x00,0x00,0x00,0x00,0x51,0x21,0x00,0x00,0x00,0x5a,0x53,0x41,0x57,0x22,0x00,
 		0x00,0x43,0x58,0x44,0x45,0x24,0x23,0x00,0x00,0x20,0x56,0x46,0x54,0x52,0x25,0x00,
 		0x00,0x4e,0x42,0x48,0x47,0x59,0x26,0x00,0x00,0x00,0x4d,0x4a,0x55,0x27,0x28,0x00,
-		0x00,0x3c,0x4b,0x49,0x4f,0x7e,0x29,0x00,0x00,0x3e,0x3f,0x4c,0x2b,0x50,0x3d,0x00,
-		0x00,0x00,0x3a,0x00,0x60,0x5f,0x00,0x00,0x00,0x00,0x0a,0x7b,0x00,0x7d,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x11,0x00,0x00,0x00,0x00,
+		0x00,0x3c,0x4b,0x49,0x4f,0x00,0x29,0x00,0x00,0x3e,0x3f,0x4c,0x2b,0x50,0x3d,0x00,
+		0x00,0x5f,0x2a,0x00,0x60,0x7e,0x00,0x00,0x00,0x00,0x0a,0x7b,0x00,0x7d,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x7c,0x11,0x00,0x00,0x00,0x00,
 		0x00,0x7f,0x14,0x00,0x13,0x12,0x1b,0x00,0x00,0x2b,0x00,0x2d,0x2a,0x00,0x00,0x00,
 #endif
 };

--- trunk/uart.c	(revision 7)
+++ trunk/uart.c	(revision 8)
@@ -7,9 +7,13 @@
 
 #include "LPC8xx.h"
 #include "./prototypes.h"
+#include "./config.h"
 
 #define TXBUFF_SIZE 16
-#define BAUDRATE 9600
+#ifndef BAUDRATE
+	// Note: Baudrate must be defined in config.h.
+	#define BAUDRATE 9600
+#endif
 #define SYSCLK 24000000
 #define DATA_LENG_8 (1<<2)
 #define PARITY_NONE (0<<4)