Merge pull request #3917 from TomoYamanaka/master

adbridge · web-flow · commit 5495e24793eb · 2017-03-14T14:42:21.000Z
Fix  mistake register setting in serial_format()
diff --git a/targets/TARGET_RENESAS/TARGET_RZ_A1H/serial_api.c b/targets/TARGET_RENESAS/TARGET_RZ_A1H/serial_api.c
@@ -398,10 +398,11 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
         break;
     }
 
-    obj->serial.uart->SCSMR = data_bits   << 6
-                       | parity_enable    << 5
-                       | parity_select    << 4
-                       | stop_bits        << 3;
+    obj->serial.uart->SCSMR = (obj->serial.uart->SCSMR & ~0x0078)
+                       | (data_bits       << 6)
+                       | (parity_enable   << 5)
+                       | (parity_select   << 4)
+                       | (stop_bits       << 3);
 }
 
 /******************************************************************************

Original file line number	Diff line number	Diff line change
`@@ -398,10 +398,11 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b`
`398`	`398`	`break;`
`399`	`399`	`}`
`400`	`400`
`401`		`- obj->serial.uart->SCSMR = data_bits << 6`
`402`		`- \| parity_enable << 5`
`403`		`- \| parity_select << 4`
`404`		`- \| stop_bits << 3;`
	`401`	`+ obj->serial.uart->SCSMR = (obj->serial.uart->SCSMR & ~0x0078)`
	`402`	`+ \| (data_bits << 6)`
	`403`	`+ \| (parity_enable << 5)`
	`404`	`+ \| (parity_select << 4)`
	`405`	`+ \| (stop_bits << 3);`
`405`	`406`	`}`
`406`	`407`
`407`	`408`	`/******************************************************************************`