boards: renesas: nxstyle fixes

Fixes to pass CI

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
This commit is contained in:
Alin Jerpelea
2021-03-16 21:37:33 +01:00
committed by Xiang Xiao
parent 1051d0ab63
commit 06a0059d87
5 changed files with 21 additions and 17 deletions
+2 -1
View File
@@ -38,7 +38,8 @@
* For details, please see ICD (RTA-FoUSB-MON) User Manual on Target M16C * For details, please see ICD (RTA-FoUSB-MON) User Manual on Target M16C
* ROM Monitor Resources or related ICD application notes." * ROM Monitor Resources or related ICD application notes."
* *
* However, the schematic appears to show that SIO/UART2 is actual connection. * However, the schematic appears to show that SIO/UART2 is actual
* connection.
* To be safe, we will error out on either selection: * To be safe, we will error out on either selection:
*/ */
+2 -2
View File
@@ -150,7 +150,7 @@ static inline void up_enpulse(bool data)
void up_lcdwrite(bool data, uint8_t ch) void up_lcdwrite(bool data, uint8_t ch)
{ {
up_setrs(data); /* Set RS appropriately */ up_setrs(data); /* Set RS appropriately */
/* Write upper nibble first. Only the lower 4 bits of P9 are valid. /* Write upper nibble first. Only the lower 4 bits of P9 are valid.
* The upper four bits are reserved and must be zero. * The upper four bits are reserved and must be zero.
@@ -233,7 +233,7 @@ void up_lcdinit(void)
up_lcddelay(20); up_lcddelay(20);
up_lcdwrite(false, 0x32); up_lcdwrite(false, 0x32);
up_lcddelay(20); up_lcddelay(20);
up_lcdwrite(false, FUNCTION_SET); /* reset sequence */ up_lcdwrite(false, FUNCTION_SET); /* reset sequence */
up_lcdwrite(false, FUNCTION_SET); up_lcdwrite(false, FUNCTION_SET);
up_lcdwrite(false, LCD_CURSOR_OFF); up_lcdwrite(false, LCD_CURSOR_OFF);
up_lcdwrite(false, LCD_CLEAR); up_lcdwrite(false, LCD_CLEAR);
+6 -6
View File
@@ -81,10 +81,9 @@ static const uint8_t g_ledstate[7] =
(GREEN_LED_ON | YELLOW_LED_OFF | RED_LED_OFF), /* LED_HEAPALLOCATE */ (GREEN_LED_ON | YELLOW_LED_OFF | RED_LED_OFF), /* LED_HEAPALLOCATE */
(GREEN_LED_OFF | YELLOW_LED_ON | RED_LED_OFF), /* LED_IRQSENABLED */ (GREEN_LED_OFF | YELLOW_LED_ON | RED_LED_OFF), /* LED_IRQSENABLED */
(GREEN_LED_ON | YELLOW_LED_ON | RED_LED_OFF), /* LED_STACKCREATED */ (GREEN_LED_ON | YELLOW_LED_ON | RED_LED_OFF), /* LED_STACKCREATED */
(GREEN_LED_ON | YELLOW_LED_OFF | RED_LED_ON), /* LED_INIRQ */
(GREEN_LED_ON | YELLOW_LED_OFF | RED_LED_ON ), /* LED_INIRQ */ (GREEN_LED_OFF | YELLOW_LED_ON | RED_LED_ON), /* LED_SIGNAL */
(GREEN_LED_OFF | YELLOW_LED_ON | RED_LED_ON ), /* LED_SIGNAL */ (GREEN_LED_ON | YELLOW_LED_ON | RED_LED_ON) /* LED_ASSERTION */
(GREEN_LED_ON | YELLOW_LED_ON | RED_LED_ON ) /* LED_ASSERTION */
}; };
static uint8_t g_prevled[3]; static uint8_t g_prevled[3];
@@ -154,8 +153,8 @@ void board_autoled_on(int led)
{ {
uint8_t ledset; uint8_t ledset;
/* If this is the ASSERTION led, preserve the Y&G bits from the last setting /* If this is the ASSERTION led, preserve the Y&G bits from the last
* and set the RED LED on. * setting and set the RED LED on.
*/ */
if (led == LED_ASSERTION) if (led == LED_ASSERTION)
@@ -178,6 +177,7 @@ void board_autoled_on(int led)
{ {
g_nestlevel++; g_nestlevel++;
} }
g_prevled[g_nestlevel] = led; g_prevled[g_nestlevel] = led;
} }
} }
@@ -69,7 +69,7 @@ extern "C"
#endif #endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions Definitions
****************************************************************************/ ****************************************************************************/
#undef EXTERN #undef EXTERN
+10 -7
View File
@@ -461,8 +461,8 @@ static void interrupt(int signo)
static void show_usage(const char *progname, int exitcode) static void show_usage(const char *progname, int exitcode)
{ {
fprintf(stderr, fprintf(stderr,
"\nUSAGE: %s [-h] [-d] [-t <ttyname>] [-b <baud>] [-l <log-file>]\n", "\nUSAGE: %s [-h] [-d] [-t <ttyname>] [-b <baud>] [-l <log-file>]\n",
progname); progname);
fprintf(stderr, "\nWhere:\n"); fprintf(stderr, "\nWhere:\n");
fprintf(stderr, "\t-h: Prints this message then exit.\n"); fprintf(stderr, "\t-h: Prints this message then exit.\n");
fprintf(stderr, "\t-d: Enable debug output (twice for verbose output).\n"); fprintf(stderr, "\t-d: Enable debug output (twice for verbose output).\n");
@@ -512,7 +512,8 @@ int main(int argc, char **argv, char **envp)
break; break;
case ':': case ':':
fprintf(stderr, "ERROR: Missing argument to option '%c'\n", optopt); fprintf(stderr, "ERROR: Missing argument to option '%c'\n",
optopt);
show_usage(argv[0], 1); show_usage(argv[0], 1);
break; break;
@@ -723,8 +724,8 @@ int main(int argc, char **argv, char **envp)
} }
#endif #endif
/* Catch attempts to control-C out of the program so that we can restore the /* Catch attempts to control-C out of the program so that we can restore
* TTY settings. * the TTY settings.
*/ */
signal(SIGINT, interrupt); signal(SIGINT, interrupt);
@@ -752,8 +753,9 @@ int main(int argc, char **argv, char **envp)
ret = readbyte(g_fdnb, &ch); ret = readbyte(g_fdnb, &ch);
if (ret == 0) if (ret == 0)
{ {
printconsole("ERROR: Unexpected number of bytes read(%d) from %s\n", printconsole(
ret, g_ttydev); "ERROR: Unexpected number of bytes read(%d) from %s\n",
ret, g_ttydev);
close_tty(); close_tty();
return 15; return 15;
} }
@@ -807,5 +809,6 @@ int main(int argc, char **argv, char **envp)
} }
} }
} }
return 0; return 0;
} }