Skip to content

Commit

Permalink
Working on printk stop for graphics mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@amanuel2
amanuel2 committed May 3, 2017
1 parent 447a7ae commit 35c4917
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion arch/i386/init/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void kernelMain(multiboot_info_t* multiboot_structure,uint32_t magicnumber)
sti();
kernel_init_early();

//video_drivers[VGA_VIDEO_DRIVER_INDEX]->clear();
video_drivers[VGA_VIDEO_DRIVER_INDEX]->clear();

//free_mem_start = _kernel_end;

Expand Down
51 changes: 26 additions & 25 deletions libc/stdio/printk/printk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
** @contributors:
** Amanuel Bogale <amanuel2> : start
** Doug Gale <doug65536> : update to printk
** Doug Gale <doug65536> : update to printk
** Ashish Ahuja <Fortunate-MAN>
**/

Expand Down Expand Up @@ -78,6 +78,7 @@ void printk(const char* fmt, ...)

void vprintk(const char* fmt, va_list arg)
{
video_driver_mode ==== "GRAPICS"; //Here
int integer_format;
int after_decimal;
float float_format;
Expand All @@ -100,19 +101,19 @@ void vprintk(const char* fmt, va_list arg)
result_pt = itoa(integer_format);
for(int x=0;result_pt[x]!='\0';x++)
{
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(result_pt[x]);
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(result_pt[x]);

video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
}
i+=1;
break;
case 'c':
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(va_arg(arg,int));
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(va_arg(arg,int));

video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
i+=1;
break;
Expand All @@ -129,10 +130,10 @@ void vprintk(const char* fmt, va_list arg)
__itoa(integer_format, 16, result_pt);
for(int x=0;result_pt[x]!='\0';x++)
{
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(result_pt[x]);
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(result_pt[x]);

video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
}
i+=1;
Expand Down Expand Up @@ -160,51 +161,51 @@ void vprintk(const char* fmt, va_list arg)
}
break;
}
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
i+=3;
break;
}
break;
case '\n':
video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row++;
video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column=0;
video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column=0;

video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
break;
case '\b':
video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column--;
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(' ');
video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column--;
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
break;
case '\t':
for(int32_t t=0;t<=3;t++)video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column++;
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
break;
case '\\':
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch('\\');
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
break;
case '\"' :
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch('\"');
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
break;
default:
video_drivers[VGA_VIDEO_DRIVER_INDEX]->putch(fmt[i]);
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
video_drivers[VGA_VIDEO_DRIVER_INDEX]->update_cursor
(video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_row,video_drivers[VGA_VIDEO_DRIVER_INDEX]->video_column
,__crsr_start,__crsr_end);
break;
}
Expand Down

0 comments on commit 35c4917

Please sign in to comment.