summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward O'Callaghan <funfunctor@folklore1984.net>2016-09-13 10:57:38 +1000
committerEdward O'Callaghan <funfunctor@folklore1984.net>2016-09-13 11:00:12 +1000
commit4ced40f0e45880171e091b6fe7aee39665d2e70b (patch)
tree4253318e0b95985be824dc37586e64705f2af721
parentb7d6f5720da8440f0fc8775ac9373c746911bb92 (diff)
servicereq.c: Flip branch predicate, avoid gotorefactor
Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
-rw-r--r--firmware/servicereq.c70
1 files changed, 34 insertions, 36 deletions
diff --git a/firmware/servicereq.c b/firmware/servicereq.c
index ba8863b..886e9c9 100644
--- a/firmware/servicereq.c
+++ b/firmware/servicereq.c
@@ -893,28 +893,27 @@ x1b324:
r4 = r1 & 0xff;
r1 = 0xff;
- if (r4 == 0)
- goto skip0;
- r2 = 0xe000205c;
+ if (r4 != 0) {
+ r2 = 0xe000205c;
- do {
- r1 = read32(r2);
- r1 &= 1;
- } while (r1 == 0);
+ do {
+ r1 = read32(r2);
+ r1 &= 1;
+ } while (r1 == 0);
- r1 = 0xe0002058;
- r3 = 0xe000205c;
- write32(r1, r4);
+ r1 = 0xe0002058;
+ r3 = 0xe000205c;
+ write32(r1, r4);
- do {
- r1 = read32(r3);
- r1 ^= 1;
- r2 = r1 & 1;
- r1 = (r2 == 0);
- } while (r1 == 0);
+ do {
+ r1 = read32(r3);
+ r1 ^= 1;
+ r2 = r1 & 1;
+ r1 = (r2 == 0);
+ } while (r1 == 0);
- r1 = r2;
-skip0:
+ r1 = r2;
+ }
r4 = 0xe0000000;
r3 = r4;
@@ -942,28 +941,27 @@ skip0:
r4 = r1 & 0xff;
r1 = 0xff;
- if (r4 == 0)
- goto skip1;
- r2 = 0xe000205c;
+ if (r4 != 0) {
+ r2 = 0xe000205c;
- do {
- r1 = read32(r2);
- r1 &= 1;
- } while (r1 == 0);
+ do {
+ r1 = read32(r2);
+ r1 &= 1;
+ } while (r1 == 0);
- r1 = 0xe0002058;
- r3 = 0xe000205c;
- write32(r1, r4);
+ r1 = 0xe0002058;
+ r3 = 0xe000205c;
+ write32(r1, r4);
- do {
- r1 = read32(r3);
- r1 ^= 1;
- r2 = r1 & 1;
- r1 = (r2 == 0);
- } while (r1 == 0);
+ do {
+ r1 = read32(r3);
+ r1 ^= 1;
+ r2 = r1 & 1;
+ r1 = (r2 == 0);
+ } while (r1 == 0);
- r1 = r2;
-skip1:
+ r1 = r2;
+ }
r2 = 0x1f604;
r1 = read32(r2);