Merge branch 'master' into libfat-dev

DaQueenJodi · Mar 31, 2014 · 5854cb6 · 5854cb6
2 parents 8da0937 + 5655354
commit 5854cb6
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 51 deletions.
diff --git a/bslug_include/rvl/ipc.h b/bslug_include/rvl/ipc.h
@@ -67,27 +67,32 @@ ios_ret_t IOS_CloseAsync(ios_fd_t fd, ios_cb_t cb, usr_t usrdata);
 ios_ret_t IOS_Read(ios_fd_t fd, void *buffer, size_t length);
 ios_ret_t IOS_ReadAsync(
  ios_fd_t fd, void *buffer, size_t length, ios_cb_t cb, usr_t usrdata);
-IOS_Write(ios_fd_t fd, const void *buffer, size_t length);
-IOS_WriteAsync(
+ios_ret_t IOS_Write(ios_fd_t fd, const void *buffer, size_t length);
+ios_ret_t IOS_WriteAsync(
  ios_fd_t fd, const void *buffer, size_t length, ios_cb_t cb, usr_t usrdata);
-IOS_Seek(ios_fd_t fd, int offset, int base);
-IOS_SeekAsync(ios_fd_t fd, int offset, int base, ios_cb_t cb, usr_t usrdata);
+ios_ret_t IOS_Seek(ios_fd_t fd, int offset, int base);
+ios_ret_t IOS_SeekAsync(
+ ios_fd_t fd, int offset, int base, ios_cb_t cb, usr_t usrdata);
 
-IOS_Ioctl(
+ios_ret_t IOS_Ioctl(
  ios_fd_t fd, int ioctl, const void *input, size_t input_length,
  void *output, size_t output_length);
-IOS_IoctlAsync(
+ios_ret_t IOS_IoctlAsync(
  ios_fd_t fd, int ioctl, const void *input, size_t input_length,
  void *output, size_t output_length, ios_cb_t cb, usr_t usrdata);
 
-IOS_Ioctlv(
- ios_fd_t fd, int s32 ioctl, int input_count, s32 output_count,
- ioctlv *argv);
-IOS_IoctlvAsync(
- ios_fd_t fd, int s32 ioctl, int input_count, s32 output_count,
- ioctlv *argv, ios_cb_t cb, usr_t usrdata);
-IOS_IoctlvReboot(
- ios_fd_t fd, int s32 ioctl, int input_count, s32 output_count,
- ioctlv *argv);
+ios_ret_t IOS_Ioctlv(
+ ios_fd_t fd, int ioctl, int input_count, int output_count, ioctlv *argv);
+ios_ret_t IOS_IoctlvAsync(
+ ios_fd_t fd, int ioctl, int input_count, int output_count, ioctlv *argv,
+ ios_cb_t cb, usr_t usrdata);
+ios_ret_t IOS_IoctlvReboot(
+ ios_fd_t fd, int ioctl, int input_count, int output_count, ioctlv *argv);
 
+typedef int hid_t;
+
+hid_t iosCreateHeap(size_t size);
+void *iosAlloc(hid_t hid, size_t size);
+void iosFree(hid_t hid, void *ptr);
+
 #endif /* _RVL_IPC_H_ */
diff --git a/symbols/ipc.xml b/symbols/ipc.xml
@@ -103,55 +103,44 @@
  </data>
  </symbol>
  <!-- a new version of IOS_Ioctlv rearranges a few instructions -->
- <symbol name="IOS_Ioctlv" size="0xdc" offset="0x28" >
+ <symbol name="IOS_Ioctlv" size="0xdc" offset="0x88" >
  <data>
- 7CFE3B78 3BE00000 4082000C 3BE0FFFC
- 4800004C 806D???? 38800040 38A00020
- 4??????? 2C030000 90610008 4082000C
- 3BE0FFEA 48000028 38A00000 38000007
- 90A30020 80810008 90A40024 80810008
- 90A40028 90030000 93430008 2C1F0000
- 40820038 80610008 7F64DB78
+ 40820038 80610008 7F64DB78 7F85E378
  </data>
  </symbol>
- <symbol name="IOS_Ioctlv" size="0xdc" offset="0x28" >
+ <!-- an old version of IOS_IoctlvReboot is very short -->
+ <!-- a new version of IOS_IoctlvReboot rearranges a few instructions -->
+ <symbol name="IOS_IoctlvReboot" size="0xe8" offset="0x9c" >
  <data>
- 7CFE3B78 3BE00000 4082000C 3BE0FFFC
- 4800004C 806D???? 38800040 38A00020
- 4??????? 2C030000 90610008 4082000C
- 3BE0FFEA 48000028 38A00000 90A30020
- 38000007
+ 90030028 7FA6EB78 7FC7F378 80610008
  </data>
  </symbol>
- <!-- an old version of IOS_IoctlvReboot is very short -->
- <!-- a new version of IOS_IoctlvReboot rearranges a few instructions -->
- <symbol name="IOS_IoctlvReboot" size="0xe8" offset="0x28" >
+ <symbol name="IOS_IoctlvReboot" size="0x2fc" offset="0xac" >
+ <data>
+ 2C1F0000 40820208 80610008 38000001
+ </data>
+ </symbol>
+ <symbol name="iosCreateHeap" size="0x130" offset="0x28" >
+ <data>
+ 57A006FF 408200E0 3C80
+ </data>
+ </symbol>
+ <!-- a new version of iosAllocAligned rearranges a few instructions and is
+ 0x1fc in length. -->
+ <symbol name="iosAllocAligned" size="0x204" offset="0x40" >
  <data>
- 7CFE3B78 3BE00000 4082000C 3BE0FFFC
- 4800004C 806D???? 38800040 38A00020
- 4??????? 2C030000 90610008 4082000C
- 3BE0FFEA 48000028 38A00000 38000007
- 90A30020 80810008 90A40024 80810008
- 90A40028 90030000 93430008 2C1F0000
- 40820044 80610008 38000001
+ 381EFFFF 7FC00039 408201
  </data>
  </symbol>
- <symbol name="IOS_IoctlvReboot" size="0x2fc" offset="0x50" >
+ <!-- a new version of iosFree rearranges a few instructions -->
+ <symbol name="iosFree" size="0x1ec" offset="0x28" >
  <data>
- 34010008 3BE00000 4082000C 3BE0FFFC
- 4800004C 806D???? 38800040 38A00020
- 4??????? 2C030000 90610008 4082000C
- 3BE0FFEA 48000028 38A00000 38000007
- 90A30020
+ 2C1E0000 4182019C 2C1D0000
  </data>
  </symbol>
- <symbol name="IOS_IoctlvReboot" size="0x2fc" offset="0x50" >
+ <symbol name="iosFree" size="0x1e8" offset="0x28" >
  <data>
- 34010008 3BE00000 4082000C 3BE0FFFC
- 4800004C 806D???? 38800040 38A00020
- 4??????? 2C030000 90610008 4082000C
- 3BE0FFEA 48000028 38A00000 90A30020
- 38000007 
+ 2C1E0000 41820198 281D0007
  </data>
  </symbol>
 </symbols>