Diff: DeviceServicePort.c

Revision:

182:2bd8ec44998f

Parent:

167:bedc0a9d559a

diff -r 0b022246c43c -r 2bd8ec44998f DeviceServicePort.c
--- a/DeviceServicePort.c	Fri Jul 08 14:58:17 2016 +0000
+++ b/DeviceServicePort.c	Sun Jul 10 05:35:08 2016 +0000
@@ -11,10 +11,11 @@
 extern unsigned int  ConOutCur;
 
 void InitServicePortDefaultSettings(void) {
-  device.controller.uart[0].settings.baudRate = 921600;
+  device.service.port.settings.baud = 921600;
 }
 
 void InitServicePortState(void){ 
+  device.service.port.state.baud = device.service.port.settings.baud;
 }
 
 void DeviceStartServicePort(void){
@@ -46,7 +47,7 @@
   device.controller.uart[0].state.LCR = 0x83;
   LPC_UART0->LCR  = device.controller.uart[0].state.LCR;
   
-  Fdiv = ((pclk  / 16) / device.controller.uart[0].settings.baudRate) + 1;
+  Fdiv = ((pclk  / 16) / device.service.port.state.baud) + 1;
   
   device.controller.uart[0].state.DLM = Fdiv / 256;
   LPC_UART0->DLM = device.controller.uart[0].state.DLM;
@@ -79,21 +80,16 @@
   uint16_t i = 0;
   while (ConInPnt != ConInCur){
     device.service.buffer[i] = InCon[ConInPnt];
-    //(*s++) = InCon[ConInPnt];
     ConInPnt++; ConInPnt = ConInPnt & 0x3ff;
     i++;
   }
-  //(*s++) = 0;
   device.service.buffer[i] = 0;
   return i;
 }
 
-//void WriteConcole(char *s)
 void WriteConcole(void) {
   uint16_t i = 0;
-  //while (*s != 0){
   while (device.service.buffer[i] != 0){
-    //OutCon[ConOutPnt] = (*s++);
     OutCon[ConOutPnt] = device.service.buffer[i];
     ConOutPnt++; ConOutPnt = ConOutPnt & 0x3ff; 
     i++;