From f0bd193c9b22d0cf6c2378bb212c34a631a262a8 Mon Sep 17 00:00:00 2001
From: Russell <russell@xmos.com>
Date: Mon, 9 Jan 2012 16:54:53 +0000
Subject: [PATCH] Simplify rebootwrapper.s and put xc source at the top in
 comments.

---
 module_usb_aud_shared/rebootwrapper.s     | 62 +++++------------------
 module_usb_aud_shared/rebootwrapper.xcnot |  9 ----
 2 files changed, 13 insertions(+), 58 deletions(-)
 delete mode 100644 module_usb_aud_shared/rebootwrapper.xcnot

diff --git a/module_usb_aud_shared/rebootwrapper.s b/module_usb_aud_shared/rebootwrapper.s
index e063bc8f..ae321d2a 100644
--- a/module_usb_aud_shared/rebootwrapper.s
+++ b/module_usb_aud_shared/rebootwrapper.s
@@ -1,4 +1,14 @@
-          .file     "../../../sc_usb_audio/module_usb_aud_shared/rebootwrapper.xc"
+# Wrapper generated from this xc code
+# Then modified to fix maxchanends to 0
+# Then simplified
+#void device_reboot_implementation(chanend spare);
+#
+#// This version just exists so generate an assembly wrapper function for me.
+#void device_reboot(chanend spare) 
+#{
+#    device_reboot_implementation(spare);
+#}
+
 .extern device_reboot_implementation, "f{0}(chd)"
           .text
           .align    2
@@ -14,59 +24,13 @@
 .type  device_reboot, @function
 .linkset device_reboot.locnoside, 1
 .linkset device_reboot.locnochandec, 1
-.linkset .LLNK1, device_reboot_implementation.nstackwords $M device_reboot_implementation.nstackwords
-.linkset .LLNK0, .LLNK1 + 1
-.linkset device_reboot.nstackwords, .LLNK0
+.linkset device_reboot.nstackwords, device_reboot_implementation.nstackwords + 1
 device_reboot:
           entsp     0x1 
-.L1:
-.L3:
           bl        device_reboot_implementation 
-.L2:
           retsp     0x1 
 .size device_reboot, .-device_reboot
 .cc_bottom device_reboot.function
 .linkset device_reboot.maxchanends, 0#device_reboot_implementation.maxchanends
 .linkset device_reboot.maxtimers, device_reboot_implementation.maxtimers
-.linkset .LLNK4, device_reboot_implementation.maxthreads - 1
-.linkset .LLNK3, 1 + .LLNK4
-.linkset .LLNK2, 1 $M .LLNK3
-.linkset device_reboot.maxthreads, .LLNK2
-# Thread names for recovering thread graph in linker
-          .section .xtacalltable,       "", @progbits
-.L4:
-          .int      .L5-.L4
-          .int      0x00000000
-          .asciiz   "/local/USBAudio/sw_usb_aud_l1_ios/app_usb_aud_l1/.build"
-.cc_top device_reboot.function, device_reboot
-          .asciiz  "../../../sc_usb_audio/module_usb_aud_shared/rebootwrapper.xc"
-          .int      0x00000008
-          .long    .L3
-.cc_bottom device_reboot.function
-.L5:
-          .section .xtalabeltable,       "", @progbits
-.L6:
-          .int      .L7-.L6
-          .int      0x00000000
-          .asciiz   "/local/USBAudio/sw_usb_aud_l1_ios/app_usb_aud_l1/.build"
-.cc_top device_reboot.function, device_reboot
-          .asciiz  "../../../sc_usb_audio/module_usb_aud_shared/rebootwrapper.xc"
-          .int      0x00000009
-          .int      0x00000009
-# line info for line 9 
-          .long    .L2
-          .asciiz  "../../../sc_usb_audio/module_usb_aud_shared/rebootwrapper.xc"
-          .int      0x00000008
-          .int      0x00000008
-# line info for line 8 
-          .long    .L1
-.cc_bottom device_reboot.function
-.L7:
-          .section .dp.data,       "adw", @progbits
-.align 4
-          .align    4
-          .section .dp.bss,        "adw", @nobits
-.align 4
-          .ident    "XMOS 32-bit XC Compiler 11.11.0beta1 (build 2136)"
-          .core     "XS1"
-          .corerev  "REVB"
+.linkset device_reboot.maxthreads, device_reboot_implementation.maxthreads
diff --git a/module_usb_aud_shared/rebootwrapper.xcnot b/module_usb_aud_shared/rebootwrapper.xcnot
deleted file mode 100644
index c5755af4..00000000
--- a/module_usb_aud_shared/rebootwrapper.xcnot
+++ /dev/null
@@ -1,9 +0,0 @@
-//#include <xs1.h>
-
-void device_reboot_implementation(chanend spare);
-
-// This version just exists so generate an assembly wrapper function for me.
-void device_reboot(chanend spare) 
-{
-    device_reboot_implementation(spare);
-}