mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-08-09 17:48:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct all occurrences of "occured"

Browse source
This commit is contained in:
Lusamine 2020-11-25 07:43:39 -06:00
commit 2dda9fefc3
12 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
emummc/source/libs/fatfs/ff.c
View file

@ -3304,7 +3304,7 @@ static FRESULT find_volume ( /* FR_OK(0): successful, !=0: an error occurred */
} }
if (fmt == 4) { if (fmt == 4) {
EFSPRINTF("BRNL"); 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) { if (fmt >= 2) {
EFSPRINTF("NOFAT"); EFSPRINTF("NOFAT");

2
exosphere/mariko_fatal/source/fatfs/ff.c
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 */ /* Find an FAT volume on the drive */
fmt = find_volume(fs, LD2PT(vol)); 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 */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
bsect = fs->winsect; /* Volume location */ bsect = fs->winsect; /* Volume location */

2
fusee/fusee-primary/src/exception_handlers.c
View file

@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
uint32_t cpsr = registers[16]; uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; 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); 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); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

2
fusee/fusee-primary/src/exception_handlers_asm.s
View file

@ -19,7 +19,7 @@
ldr sp, =_regs ldr sp, =_regs
stmia sp!, {r0-r7} 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 mrs r1, spsr
tst r1, #0x20 tst r1, #0x20
subeq lr, lr, #\lr_arm_displ subeq lr, lr, #\lr_arm_displ

2
fusee/fusee-primary/src/lib/fatfs/ff.c
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 */ fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4); } 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 */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the filesystem object */ /* An FAT volume is found (bsect). Following code initializes the filesystem object */

2
fusee/fusee-secondary/src/exception_handlers.c
View file

@ -90,7 +90,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
uint32_t cpsr = registers[16]; uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; 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); 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); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

2
fusee/fusee-secondary/src/exception_handlers_asm.s
View file

@ -19,7 +19,7 @@
ldr sp, =_regs ldr sp, =_regs
stmia sp!, {r0-r7} 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 mrs r1, spsr
tst r1, #0x20 tst r1, #0x20
subeq lr, lr, #\lr_arm_displ subeq lr, lr, #\lr_arm_displ

2
fusee/fusee-secondary/src/lib/fatfs/ff.c
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 */ fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4); } 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 */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the filesystem object */ /* An FAT volume is found (bsect). Following code initializes the filesystem object */

2
sept/sept-secondary/src/exception_handlers.c
View file

@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) {
uint32_t cpsr = registers[16]; uint32_t cpsr = registers[16];
uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; 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); 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); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE);

2
sept/sept-secondary/src/exception_handlers_asm.s
View file

@ -19,7 +19,7 @@
ldr sp, =_regs ldr sp, =_regs
stmia sp!, {r0-r7} 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 mrs r1, spsr
tst r1, #0x20 tst r1, #0x20
subeq lr, lr, #\lr_arm_displ subeq lr, lr, #\lr_arm_displ

2
sept/sept-secondary/src/lib/fatfs/ff.c
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 */ fmt = bsect ? check_fs(fs, bsect) : 3; /* Check the partition */
} while (LD2PT(vol) == 0 && fmt >= 2 && ++i < 4); } 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 */ if (fmt >= 2) return FR_NO_FILESYSTEM; /* No FAT volume is found */
/* An FAT volume is found (bsect). Following code initializes the filesystem object */ /* An FAT volume is found (bsect). Following code initializes the filesystem object */

2
stratosphere/fatal/source/fatal_config.cpp
View file

@ -82,7 +82,7 @@ namespace ams::fatal::srv {
{ {
this->error_msg = "Error Code: 2%03d-%04d (0x%x)\n"; 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" "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" "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" "restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"