In progress XNotify stuff. Going to merge xam/xboxkrnl next.

src/xenia/kernel/xam/sources.gypi

@@ -11,6 +11,8 @@
     'xam_module.h',
     'xam_net.cc',
     'xam_net.h',
+    'xam_notify.cc',
+    'xam_notify.h',
     'xam_ordinals.h',
     'xam_private.h',
     'xam_state.cc',

src/xenia/kernel/xam/xam_module.cc

@@ -45,6 +45,7 @@ XamModule::XamModule(Emulator* emulator) :
   RegisterInfoExports(export_resolver_, xam_state_);
   RegisterInputExports(export_resolver_, xam_state_);
   RegisterNetExports(export_resolver_, xam_state_);
+  RegisterNotifyExports(export_resolver_, xam_state_);
   RegisterUserExports(export_resolver_, xam_state_);
   RegisterVideoExports(export_resolver_, xam_state_);
 }

src/xenia/kernel/xam/xam_notify.cc

@@ -0,0 +1,95 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/kernel/xam/xam_notify.h>
+
+#include <xenia/kernel/shim_utils.h>
+#include <xenia/kernel/xam/xam_private.h>
+#include <xenia/kernel/xam/xam_state.h>
+#include <xenia/kernel/xboxkrnl/objects/xnotify_listener.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+using namespace xe::kernel::xam;
+using namespace xe::kernel::xboxkrnl;
+
+
+namespace xe {
+namespace kernel {
+namespace xam {
+
+
+SHIM_CALL XamNotifyCreateListener_shim(
+    PPCContext* ppc_state, XamState* state) {
+  uint64_t mask = SHIM_GET_ARG_64(0);
+  uint32_t one = SHIM_GET_ARG_32(1);
+
+  XELOGD(
+      "XamNotifyCreateListener(%.8llX, %d)",
+      mask,
+      one);
+
+  // r4=1 may indicate user process?
+
+  //return handle;
+
+  SHIM_SET_RETURN(0);
+}
+
+
+// http://ffplay360.googlecode.com/svn/Test/Common/AtgSignIn.cpp
+SHIM_CALL XNotifyGetNext_shim(
+    PPCContext* ppc_state, XamState* state) {
+  uint32_t handle = SHIM_GET_ARG_32(0);
+  uint32_t match_id = SHIM_GET_ARG_32(1);
+  uint32_t id_ptr = SHIM_GET_ARG_32(2);
+  uint32_t param_ptr = SHIM_GET_ARG_32(3);
+
+  XELOGD(
+      "XNotifyGetNext(%.8X, %.8X, %.8X, %.8X)",
+      handle,
+      match_id,
+      id_ptr,
+      param_ptr);
+
+  // get from handle
+  XNotifyListener* listener = 0;
+
+  bool dequeued = false;
+  uint32_t id = 0;
+  uint32_t param = 0;
+  if (match_id) {
+    // Asking for a specific notification
+    id = match_id;
+    dequeued = listener->DequeueNotification(match_id, &param);
+  } else {
+    // Just get next.
+    dequeued = listener->DequeueNotification(&id, &param);
+  }
+
+  if (dequeued) {
+    SHIM_SET_MEM_32(id_ptr, id);
+    SHIM_SET_MEM_32(param_ptr, param);
+  }
+
+  SHIM_SET_RETURN(dequeued ? 1 : 0);
+}
+
+
+}  // namespace xam
+}  // namespace kernel
+}  // namespace xe
+
+
+void xe::kernel::xam::RegisterNotifyExports(
+    ExportResolver* export_resolver, XamState* state) {
+  SHIM_SET_MAPPING("xam.xex", XamNotifyCreateListener, state);
+  SHIM_SET_MAPPING("xam.xex", XNotifyGetNext, state);
+}

src/xenia/kernel/xam/xam_notify.h

@@ -0,0 +1,31 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_KERNEL_XAM_NOTIFY_H_
+#define XENIA_KERNEL_XAM_NOTIFY_H_
+
+#include <xenia/common.h>
+#include <xenia/core.h>
+
+#include <xenia/xbox.h>
+
+
+namespace xe {
+namespace kernel {
+namespace xam {
+
+
+
+
+}  // namespace xam
+}  // namespace kernel
+}  // namespace xe
+
+
+#endif  // XENIA_KERNEL_XAM_NOTIFY_H_

src/xenia/kernel/xam/xam_private.h

@@ -34,6 +34,7 @@ void RegisterContentExports(ExportResolver* export_resolver, XamState* state);
 void RegisterInfoExports(ExportResolver* export_resolver, XamState* state);
 void RegisterInputExports(ExportResolver* export_resolver, XamState* state);
 void RegisterNetExports(ExportResolver* export_resolver, XamState* state);
+void RegisterNotifyExports(ExportResolver* export_resolver, XamState* state);
 void RegisterUserExports(ExportResolver* export_resolver, XamState* state);
 void RegisterVideoExports(ExportResolver* export_resolver, XamState* state);