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 8ed1fa4d..50bd4543 100755 Binary files a/05_uart0/kernel8.img and b/05_uart0/kernel8.img differ 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 e38c460f..00482c06 100755 Binary files a/06_random/kernel8.img and b/06_random/kernel8.img differ diff --git a/06_random/uart.c b/06_random/uart.c index 111eb97e..cda6ab88 100644 --- a/06_random/uart.c +++ b/06_random/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/07_delays/kernel8.img b/07_delays/kernel8.img index 55ed366d..c50adb2d 100755 Binary files a/07_delays/kernel8.img and b/07_delays/kernel8.img differ 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 efb06bde..0b674771 100755 Binary files a/08_power/kernel8.img and b/08_power/kernel8.img differ 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 4fb7f868..0bbed218 100755 Binary files a/09_framebuffer/kernel8.img and b/09_framebuffer/kernel8.img differ 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 08acab88..7e73037a 100755 Binary files a/0A_pcscreenfont/kernel8.img and b/0A_pcscreenfont/kernel8.img differ 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 e75f3638..2721dfa0 100755 Binary files a/0B_readsector/kernel8.img and b/0B_readsector/kernel8.img differ 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 3716b912..13b713b1 100755 Binary files a/0C_directory/kernel8.img and b/0C_directory/kernel8.img differ 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 5817812e..595d1d34 100755 Binary files a/0D_readfile/kernel8.img and b/0D_readfile/kernel8.img differ 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 6837a56b..92b9a1ac 100755 Binary files a/0E_initrd/kernel8.img and b/0E_initrd/kernel8.img differ 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 ff00bfdd..95168bc2 100755 Binary files a/0F_executionlevel/kernel8.img and b/0F_executionlevel/kernel8.img differ 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 0202f530..c5438321 100755 Binary files a/10_virtualmemory/kernel8.img and b/10_virtualmemory/kernel8.img differ 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 0189d46c..4357c4bd 100755 Binary files a/11_exceptions/kernel8.img and b/11_exceptions/kernel8.img differ diff --git a/11_exceptions/uart.c b/11_exceptions/uart.c index d368d399..cda6ab88 100644 --- a/11_exceptions/uart.c +++ b/11_exceptions/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"); }