From e1c97f290493be3ae45dda8877751cbeec52db47 Mon Sep 17 00:00:00 2001 From: bzt Date: Sat, 13 Jan 2018 21:31:34 +0100 Subject: [PATCH] Fixed issue #2 --- 03_uart1/uart.c | 2 +- 04_mailboxes/uart.c | 2 +- 05_uart0/kernel8.img | Bin 1024 -> 1024 bytes 05_uart0/uart.c | 4 ++-- 06_random/kernel8.img | Bin 1040 -> 1040 bytes 06_random/uart.c | 4 ++-- 07_delays/kernel8.img | Bin 1400 -> 1400 bytes 07_delays/uart.c | 4 ++-- 08_power/kernel8.img | Bin 1608 -> 1608 bytes 08_power/uart.c | 4 ++-- 09_framebuffer/kernel8.img | Bin 26400 -> 26400 bytes 09_framebuffer/uart.c | 4 ++-- 0A_pcscreenfont/kernel8.img | Bin 4048 -> 4048 bytes 0A_pcscreenfont/uart.c | 4 ++-- 0B_readsector/kernel8.img | Bin 5832 -> 5832 bytes 0B_readsector/uart.c | 4 ++-- 0C_directory/kernel8.img | Bin 7168 -> 7168 bytes 0C_directory/uart.c | 4 ++-- 0D_readfile/kernel8.img | Bin 7496 -> 7496 bytes 0D_readfile/uart.c | 4 ++-- 0E_initrd/kernel8.img | Bin 43136 -> 43136 bytes 0E_initrd/uart.c | 2 +- 0F_executionlevel/kernel8.img | Bin 960 -> 960 bytes 0F_executionlevel/uart.c | 2 +- 10_virtualmemory/kernel8.img | Bin 4152 -> 4152 bytes 10_virtualmemory/uart.c | 2 +- 11_exceptions/kernel8.img | Bin 8248 -> 8248 bytes 11_exceptions/uart.c | 2 +- 28 files changed, 24 insertions(+), 24 deletions(-) diff --git a/03_uart1/uart.c b/03_uart1/uart.c index 0b74e6f4..a76ef93d 100644 --- a/03_uart1/uart.c +++ b/03_uart1/uart.c @@ -74,7 +74,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(!(*AUX_MU_LSR&0x20)); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *AUX_MU_IO=c; } diff --git a/04_mailboxes/uart.c b/04_mailboxes/uart.c index 61b76e24..a012a2ec 100644 --- a/04_mailboxes/uart.c +++ b/04_mailboxes/uart.c @@ -74,7 +74,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(!(*AUX_MU_LSR&0x20)); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *AUX_MU_IO=c; } diff --git a/05_uart0/kernel8.img b/05_uart0/kernel8.img index 8ed1fa4d129dca71849291187e1639627e3a66ac..50bd4543bed9e963554828b0f2259b2b1d9d62f4 100755 GIT binary patch delta 22 dcmZqRXyBM|jJqS~fKWq_BZI?EmyH+onE_o_2qFLg delta 22 dcmZqRXyBM|jJqZ1fKWq_BZI?Em5mqmnE_mT2mSy6 diff --git a/05_uart0/uart.c b/05_uart0/uart.c index 111eb97e..cda6ab88 100644 --- a/05_uart0/uart.c +++ b/05_uart0/uart.c @@ -60,7 +60,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 r=150; while(r--) { asm volatile("nop"); } @@ -81,7 +81,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/06_random/kernel8.img b/06_random/kernel8.img index e38c460f7d7426f57268039873e75f4906d89ebe..00482c06039381d838bccfc321171148f8181eac 100755 GIT binary patch delta 22 ecmbQhF@a;kG476_140c!jtmYvT{d2{X9fUZ7YI@S delta 22 ecmbQhF@a;kG47V2140c!jtmYvRW@FU#J6$$2GLU#J5@F_GLzW@LL diff --git a/07_delays/uart.c b/07_delays/uart.c index 55fef794..7c66575a 100644 --- a/07_delays/uart.c +++ b/07_delays/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/08_power/kernel8.img b/08_power/kernel8.img index efb06bde53d274ad1e72a6c1d5245a52df8a77d6..0b674771094d2ad6b7d820fee334a8556ecb9897 100755 GIT binary patch delta 24 gcmX@XbAo5XH%9J`paVh;L5>U#J6$$2GP$z=0C;f-SO5S3 delta 24 gcmX@XbAo5XH%9K3paVh;L5>U#J5@F_GP$z=0C#Z+Gynhq diff --git a/08_power/uart.c b/08_power/uart.c index 55fef794..7c66575a 100644 --- a/08_power/uart.c +++ b/08_power/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/09_framebuffer/kernel8.img b/09_framebuffer/kernel8.img index 4fb7f86822a14de479018c5ad4f4d7aee26954e4..0bbed2180cb8caff9ed09dd43adba84170765407 100755 GIT binary patch delta 26 icmZ2*j&Z>`#tmUC+#Nv&gc^bz860-HY))j^p9BDoJPIiQ delta 26 icmZ2*j&Z>`#tmUC+$})|gc^bz860-1Y))j^p9BDnJPHK> diff --git a/09_framebuffer/uart.c b/09_framebuffer/uart.c index 55fef794..7c66575a 100644 --- a/09_framebuffer/uart.c +++ b/09_framebuffer/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/0A_pcscreenfont/kernel8.img b/0A_pcscreenfont/kernel8.img index 08acab88b66f6609f208dd721039994fb1806272..7e73037afd60f78632fd1cdb130af0ac811c7e24 100755 GIT binary patch delta 24 gcmca0e?fl3F&6HQpaVh;L5>U#J6$$kWckkp0DgxF@c;k- delta 24 gcmca0e?fl3F&6HYpaVh;L5>U#J5@GcWckkp0DXrE%>V!Z diff --git a/0A_pcscreenfont/uart.c b/0A_pcscreenfont/uart.c index 55fef794..7c66575a 100644 --- a/0A_pcscreenfont/uart.c +++ b/0A_pcscreenfont/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/0B_readsector/kernel8.img b/0B_readsector/kernel8.img index e75f36387c35353dd21f10e1b34aaf03522a4702..2721dfa071c97206def65366f0c23dc650666169 100755 GIT binary patch delta 24 gcmX@1dqQ`^H%9J`paVh;L5>U#J6$$2G94EI0DmnBDgXcg delta 24 gcmX@1dqQ`^H%9K3paVh;L5>U#J5@F_G94EI0DdhA1^@s6 diff --git a/0B_readsector/uart.c b/0B_readsector/uart.c index 8297d9ff..88058507 100644 --- a/0B_readsector/uart.c +++ b/0B_readsector/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/0C_directory/kernel8.img b/0C_directory/kernel8.img index 3716b9123608676570bf21d4625d4ca52c04f487..13b713b1a2fb1fb6a158dd293e5fcc84f6d74b0d 100755 GIT binary patch delta 24 fcmZp$Xt3Dujgh+}=zvf|kRyY`PM6J$O#dYTbe0J1 delta 24 fcmZp$Xt3Dujgh-0=zvf|kRyY`PL<7!O#dYTbCw9n diff --git a/0C_directory/uart.c b/0C_directory/uart.c index 8297d9ff..88058507 100644 --- a/0C_directory/uart.c +++ b/0C_directory/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/0D_readfile/kernel8.img b/0D_readfile/kernel8.img index 5817812e57f31dd168931a1988cf24dd6b5102bf..595d1d34a4d9f9cf3830c76e3f26cb4f596a5271 100755 GIT binary patch delta 24 gcmX?Mb;4@HH%9J`paVh;L5>U#J6$$2GPz3w0Dy1^%K!iX delta 24 gcmX?Mb;4@HH%9K3paVh;L5>U#J5@F_GPz3w0Do`@rvLx| diff --git a/0D_readfile/uart.c b/0D_readfile/uart.c index 8297d9ff..88058507 100644 --- a/0D_readfile/uart.c +++ b/0D_readfile/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); @@ -82,7 +82,7 @@ void uart_init() void uart_send(unsigned int c) { /* wait until we can send */ do{asm volatile("nop");}while(*UART0_FR&0x20); - /* write the carachter to the buffer */ + /* write the character to the buffer */ *UART0_DR=c; } diff --git a/0E_initrd/kernel8.img b/0E_initrd/kernel8.img index 6837a56bd4ebc2b5ed1ded6a13d01aa494921231..92b9a1acbc7f1f92c2fb3e2121fef82239ced712 100755 GIT binary patch delta 145 zcmZp;$kcF=X~Q>0?v9`XLJdKV3=TV8HZw9!VUsX7WiT{0GBPtZH#0OdW-u@`G&VD1 zP%xP6$eA)(kn=x}e|AY?$>Gh3d6kLjlO?zuHivR;;odAD)?*`RW@2V$U|_YPKm+hrLniY05m2kSO5S3 delta 137 zcmZp;$kcF=X~Q>0?v|hfLJdKV3=TV0HZw9!VUsX3V=y!}GBPnVH!v|YVlXf?G&VJ4 zP%xP6$eFTPP@I=>vJ#io=6J4++>;GB*f$G^_1FlS7@8Rxo0$R?8<-mz!xaZtaY-53 e*ccjV)@XoeQ%!3HAkf!WNX#iQ-MlpRwif{6+asd@ diff --git a/0E_initrd/uart.c b/0E_initrd/uart.c index d0d9a6fd..88058507 100644 --- a/0E_initrd/uart.c +++ b/0E_initrd/uart.c @@ -61,7 +61,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 wait_cycles(150); diff --git a/0F_executionlevel/kernel8.img b/0F_executionlevel/kernel8.img index ff00bfdd8fa80a9e2da8f54dfbf626f61d1cc49a..95168bc2744d10fe1ed464a8cc8eaf384231ee7a 100755 GIT binary patch delta 23 fcmX@Wet><#Kkkm8140c!jtmYvT{d$vZf61jatR2U delta 23 fcmX@Wet><#Kkk;G140c!jtmYvRW@@nZf61jaR~@^ diff --git a/0F_executionlevel/uart.c b/0F_executionlevel/uart.c index d368d399..cda6ab88 100644 --- a/0F_executionlevel/uart.c +++ b/0F_executionlevel/uart.c @@ -60,7 +60,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 r=150; while(r--) { asm volatile("nop"); } diff --git a/10_virtualmemory/kernel8.img b/10_virtualmemory/kernel8.img index 0202f5303ac7670ca6a6586e2e513f8f647cd436..c5438321ba3d22ee265d3185065a000c9c14238c 100755 GIT binary patch delta 24 gcmdm?utQU#J6$%fWa{Sy0CmI(0ssI2 delta 24 gcmdm?utQU#J5@HXWa{Sy0CdC%-T(jq diff --git a/10_virtualmemory/uart.c b/10_virtualmemory/uart.c index d368d399..cda6ab88 100644 --- a/10_virtualmemory/uart.c +++ b/10_virtualmemory/uart.c @@ -60,7 +60,7 @@ void uart_init() /* map UART0 to GPIO pins */ r=*GPFSEL1; r&=~((7<<12)|(7<<15)); // gpio14, gpio15 - r|=(2<<12)|(2<<15); // alt5 + r|=(4<<12)|(4<<15); // alt0 *GPFSEL1 = r; *GPPUD = 0; // enable pins 14 and 15 r=150; while(r--) { asm volatile("nop"); } diff --git a/11_exceptions/kernel8.img b/11_exceptions/kernel8.img index 0189d46c0cde78abc2992fec89bb84fb5d0c09d9..4357c4bdeaf56525dd3d53f1e0b1cde33ae34537 100755 GIT binary patch delta 24 gcmdntu)|@)Hg4{YpaVh;L5>U#J6$#(U#J5@Fx