Fix-Point commented on code in PR #15936:
URL: https://github.com/apache/nuttx/pull/15936#discussion_r1980532444
##########
arch/x86_64/src/intel64/intel64_fbterm.c:
##########
@@ -348,5 +362,7 @@ void fb_putc(char ch)
}
g_fb_term.cursor_x += fbm->metric.width;
+
+ return ;
Review Comment:
Done.
##########
arch/x86_64/src/intel64/intel64_fbterm.c:
##########
@@ -284,43 +296,45 @@ void x86_64_mb2_fbinitialize(struct
multiboot_tag_framebuffer *fbt)
* Name: fb_putc
****************************************************************************/
-void fb_putc(char ch)
+void fb_putc(int ch)
{
const struct nx_fontbitmap_s *fbm;
uint8_t gly_x;
uint8_t gly_y;
+ NXHANDLE font_handle = (NXHANDLE)g_fb_term.font;
if (g_fb.baseaddr == NULL)
{
- return;
+ return ;
}
if (ch == '\n')
{
g_fb_term.cursor_y += g_fb_term.font->metrics.mxheight;
- return;
+ g_fb_term.cursor_x = 0;
+ return ;
}
if (ch == '\r')
{
g_fb_term.cursor_x = 0;
- return;
+ return ;
}
- fbm = nxf_getbitmap((NXHANDLE)g_fb_term.font, ch);
+ fbm = nxf_getbitmap(font_handle, ch);
if (fbm == NULL)
{
- fb_putc('.');
- return;
+ fbm = nxf_getbitmap(font_handle, '.');
+ g_fb_term.cursor_x += fbm->metric.width;
+ return ;
Review Comment:
Done.
##########
arch/x86_64/src/intel64/intel64_fbterm.c:
##########
@@ -284,43 +296,45 @@ void x86_64_mb2_fbinitialize(struct
multiboot_tag_framebuffer *fbt)
* Name: fb_putc
****************************************************************************/
-void fb_putc(char ch)
+void fb_putc(int ch)
{
const struct nx_fontbitmap_s *fbm;
uint8_t gly_x;
uint8_t gly_y;
+ NXHANDLE font_handle = (NXHANDLE)g_fb_term.font;
if (g_fb.baseaddr == NULL)
{
- return;
+ return ;
}
if (ch == '\n')
{
g_fb_term.cursor_y += g_fb_term.font->metrics.mxheight;
- return;
+ g_fb_term.cursor_x = 0;
+ return ;
}
if (ch == '\r')
{
g_fb_term.cursor_x = 0;
- return;
+ return ;
Review Comment:
Done.
##########
arch/x86_64/src/intel64/intel64_fbterm.c:
##########
@@ -284,43 +296,45 @@ void x86_64_mb2_fbinitialize(struct
multiboot_tag_framebuffer *fbt)
* Name: fb_putc
****************************************************************************/
-void fb_putc(char ch)
+void fb_putc(int ch)
{
const struct nx_fontbitmap_s *fbm;
uint8_t gly_x;
uint8_t gly_y;
+ NXHANDLE font_handle = (NXHANDLE)g_fb_term.font;
if (g_fb.baseaddr == NULL)
{
- return;
+ return ;
}
if (ch == '\n')
{
g_fb_term.cursor_y += g_fb_term.font->metrics.mxheight;
- return;
+ g_fb_term.cursor_x = 0;
+ return ;
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
