diff options
| author | Max <mparisi@stevens.edu> | 2020-09-26 13:33:28 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-09-26 13:33:28 -0400 |
| commit | a343859be6918a2ed8e5d0683bdc4f4cbad86397 (patch) | |
| tree | 9b562e4a43efe1b17a030deb54dc01ac46c27329 /asm/SDK/OS/OSAlarm.s | |
| parent | 3c70d4473a7085dadbcb0350c2b8e00f1148c639 (diff) | |
| parent | c209bed1a0e67280b796c7dfb4c84272c8065b9b (diff) | |
resolve more merge conflicts
Diffstat (limited to 'asm/SDK/OS/OSAlarm.s')
| -rw-r--r-- | asm/SDK/OS/OSAlarm.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/SDK/OS/OSAlarm.s b/asm/SDK/OS/OSAlarm.s index 29c305c..5359257 100644 --- a/asm/SDK/OS/OSAlarm.s +++ b/asm/SDK/OS/OSAlarm.s @@ -191,7 +191,7 @@ lbl_80269964: /* 80269968 002655C8 4B FF E8 F1 */ bl func_80268258 lbl_8026996C: /* 8026996C 002655CC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80269970 002655D0 4B F5 D7 FD */ bl func_801C716C +/* 80269970 002655D0 4B F5 D7 FD */ bl _restgpr_25 /* 80269974 002655D4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80269978 002655D8 7C 08 03 A6 */ mtlr r0 /* 8026997C 002655DC 38 21 00 30 */ addi r1, r1, 0x30 @@ -258,7 +258,7 @@ OSSetPeriodicAlarm: /* 80269A58 002656B8 7F E3 FB 78 */ mr r3, r31 /* 80269A5C 002656BC 48 00 4D 29 */ bl OSRestoreInterrupts /* 80269A60 002656C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80269A64 002656C4 4B F5 D7 0D */ bl func_801C7170 +/* 80269A64 002656C4 4B F5 D7 0D */ bl _restgpr_26 /* 80269A68 002656C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80269A6C 002656CC 7C 08 03 A6 */ mtlr r0 /* 80269A70 002656D0 38 21 00 20 */ addi r1, r1, 0x20 |