Correct all occurrences of "occured"

This commit is contained in:
Lusamine 2020-11-25 07:43:39 -06:00
parent ee9585dd57
commit 2dda9fefc3
12 changed files with 12 additions and 12 deletions

View file

@ -3304,7 +3304,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */
}
if (fmt == 4) {
EFSPRINTF("BRNL");
return FR_DISK_ERR; /* An error occured in the disk I/O layer */
return FR_DISK_ERR; /* An error occurred in the disk I/O layer */
}
if (fmt >= 2) {
EFSPRINTF("NOFAT");

View file

@ -3441,7 +3441,7 @@ static FRESULT mount_volume ( /* FR_OK(0): successful, !=0: an error occurred
/* Find an FAT volume on the drive */
fmt = find_volume(fs, LD2PT(vol));
if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */
if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */
if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
bsect = fs->winsect; /* Volume location */

View file

@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE;
sprintf(exception_log, "An exception occured!\n");
sprintf(exception_log, "An exception occurred!\n");
code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE);
stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

View file

@ -19,7 +19,7 @@
ldr sp, =_regs
stmia sp!, {r0-r7}
/* Adjust lr to make it point to the location where the exception occured. */
/* Adjust lr to make it point to the location where the exception occurred. */
mrs r1, spsr
tst r1, #0x20
subeq lr, lr, #\lr_arm_displ

View file

@ -3284,7 +3284,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */
fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4);
}
if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */
if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */
if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the filesystem object */

View file

@ -90,7 +90,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE;
sprintf(exception_log, "An exception occured!\n");
sprintf(exception_log, "An exception occurred!\n");
code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE);
stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

View file

@ -19,7 +19,7 @@
ldr sp, =_regs
stmia sp!, {r0-r7}
/* Adjust lr to make it point to the location where the exception occured. */
/* Adjust lr to make it point to the location where the exception occurred. */
mrs r1, spsr
tst r1, #0x20
subeq lr, lr, #\lr_arm_displ

View file

@ -3284,7 +3284,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */
fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4);
}
if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */
if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */
if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the filesystem object */

View file

@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE;
sprintf(exception_log, "An exception occured!\n");
sprintf(exception_log, "An exception occurred!\n");
code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE);
stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

View file

@ -19,7 +19,7 @@
ldr sp, =_regs
stmia sp!, {r0-r7}
/* Adjust lr to make it point to the location where the exception occured. */
/* Adjust lr to make it point to the location where the exception occurred. */
mrs r1, spsr
tst r1, #0x20
subeq lr, lr, #\lr_arm_displ

View file

@ -3284,7 +3284,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */
fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4);
}
if (fmt == 4) return FR_DISK_ERR; /* An error occured in the disk I/O layer */
if (fmt == 4) return FR_DISK_ERR; /* An error occurred in the disk I/O layer */
if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the filesystem object */

View file

@ -82,7 +82,7 @@ namespace ams::fatal::srv {
{
this->error_msg = "Error Code: 2%03d-%04d (0x%x)\n";
this->error_desc = "An error has occured.\n\n"
this->error_desc = "An error has occurred.\n\n"
"Please press the POWER Button to restart the console normally, or a VOL button\n"
"to reboot to a payload (or RCM, if none is present). If you are unable to\n"
"restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"