Screw convention; moving include files alongside source files.

They now will show up in xcode/etc.

src/xenia/kernel/modules/xam/sources.gypi

@@ -0,0 +1,8 @@
+# Copyright 2013 Ben Vanik. All Rights Reserved.
+{
+  'sources': [
+    'xam_info.cc',
+    'xam_module.cc',
+    'xam_state.cc',
+  ],
+}

src/xenia/kernel/modules/xam/xam_info.cc

@@ -0,0 +1,77 @@
+/**
+ ******************************************************************************
+ * 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/modules/xam/xam_info.h>
+
+#include <xenia/kernel/shim_utils.h>
+#include <xenia/kernel/xbox.h>
+#include <xenia/kernel/modules/xam/xam_module.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+using namespace xe::kernel::xam;
+
+
+namespace {
+
+
+void XGetAVPack_shim(
+    xe_ppc_state_t* ppc_state, XamState* state) {
+  // DWORD
+  // Not sure what the values are for this, but 6 is VGA.
+  // Other likely values are 3/4/8 for HDMI or something.
+  // Games seem to use this as a PAL check - if the result is not 3/4/6/8
+  // they explode with errors if not in PAL mode.
+  SHIM_SET_RETURN(6);
+}
+
+
+void XGetGameRegion_shim(
+    xe_ppc_state_t* ppc_state, XamState* state) {
+  XELOGD(XT("XGetGameRegion()"));
+
+  SHIM_SET_RETURN(XEX_REGION_ALL);
+}
+
+
+void XGetLanguage_shim(
+    xe_ppc_state_t* ppc_state, XamState* state) {
+  XELOGD(XT("XGetLanguage()"));
+
+  uint32_t desired_language = X_LANGUAGE_ENGLISH;
+
+  // Switch the language based on game region.
+  // TODO(benvanik): pull from xex header.
+  uint32_t game_region = XEX_REGION_NTSCU;
+  if (game_region & XEX_REGION_NTSCU) {
+    desired_language = X_LANGUAGE_ENGLISH;
+  } else if (game_region & XEX_REGION_NTSCJ) {
+    desired_language = X_LANGUAGE_JAPANESE;
+  }
+  // Add more overrides?
+
+  SHIM_SET_RETURN(desired_language);
+}
+
+}
+
+
+void xe::kernel::xam::RegisterInfoExports(
+    ExportResolver* export_resolver, XamState* state) {
+  #define SHIM_SET_MAPPING(ordinal, shim, impl) \
+    export_resolver->SetFunctionMapping("xam.xex", ordinal, \
+        state, (xe_kernel_export_shim_fn)shim, (xe_kernel_export_impl_fn)impl)
+
+  SHIM_SET_MAPPING(0x000003CB, XGetAVPack_shim, NULL);
+  SHIM_SET_MAPPING(0x000003CC, XGetGameRegion_shim, NULL);
+  SHIM_SET_MAPPING(0x000003CD, XGetLanguage_shim, NULL);
+
+  #undef SET_MAPPING
+}

src/xenia/kernel/modules/xam/xam_info.h

@@ -0,0 +1,29 @@
+/**
+ ******************************************************************************
+ * 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_MODULES_XAM_INFO_H_
+#define XENIA_KERNEL_MODULES_XAM_INFO_H_
+
+#include <xenia/kernel/modules/xam/xam_state.h>
+
+
+namespace xe {
+namespace kernel {
+namespace xam {
+
+
+void RegisterInfoExports(ExportResolver* export_resolver, XamState* state);
+
+
+}  // namespace xam
+}  // namespace kernel
+}  // namespace xe
+
+
+#endif  // XENIA_KERNEL_MODULES_XAM_INFO_H_

src/xenia/kernel/modules/xam/xam_module.cc

@@ -0,0 +1,34 @@
+/**
+ ******************************************************************************
+ * 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/modules/xam/xam_module.h>
+
+#include <xenia/kernel/modules/xam/xam_info.h>
+#include <xenia/kernel/modules/xam/xam_table.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+using namespace xe::kernel::xam;
+
+
+XamModule::XamModule(Runtime* runtime) :
+    KernelModule(runtime) {
+  export_resolver_->RegisterTable(
+      "xam.xex", xam_export_table, XECOUNT(xam_export_table));
+
+  // Setup the xam state instance.
+  xam_state = auto_ptr<XamState>(new XamState(pal_, memory_, export_resolver_));
+
+  // Register all exported functions.
+  RegisterInfoExports(export_resolver_.get(), xam_state.get());
+}
+
+XamModule::~XamModule() {
+}

src/xenia/kernel/modules/xam/xam_module.h

@@ -0,0 +1,42 @@
+/**
+ ******************************************************************************
+ * 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_MODULES_XAM_H_
+#define XENIA_KERNEL_MODULES_XAM_H_
+
+#include <xenia/common.h>
+#include <xenia/core.h>
+
+#include <xenia/kernel/export.h>
+#include <xenia/kernel/kernel_module.h>
+
+
+namespace xe {
+namespace kernel {
+namespace xam {
+
+class XamState;
+
+
+class XamModule : public KernelModule {
+public:
+  XamModule(Runtime* runtime);
+  virtual ~XamModule();
+
+private:
+  auto_ptr<XamState> xam_state;
+};
+
+
+}  // namespace xam
+}  // namespace kernel
+}  // namespace xe
+
+
+#endif  // XENIA_KERNEL_MODULES_XAM_H_

src/xenia/kernel/modules/xam/xam_state.cc

@@ -0,0 +1,33 @@
+/**
+ ******************************************************************************
+ * 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/modules/xam/xam_state.h>
+
+
+using namespace xe;
+using namespace xe::kernel;
+using namespace xe::kernel::xam;
+
+
+namespace {
+
+}
+
+
+XamState::XamState(xe_pal_ref pal, xe_memory_ref memory,
+                   shared_ptr<ExportResolver> export_resolver) {
+  this->pal = xe_pal_retain(pal);
+  this->memory = xe_memory_retain(memory);
+  export_resolver_ = export_resolver;
+}
+
+XamState::~XamState() {
+  xe_memory_release(memory);
+  xe_pal_release(pal);
+}

src/xenia/kernel/modules/xam/xam_state.h

@@ -0,0 +1,44 @@
+/**
+ ******************************************************************************
+ * 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_MODULES_XAM_XAM_STATE_H_
+#define XENIA_KERNEL_MODULES_XAM_XAM_STATE_H_
+
+#include <xenia/common.h>
+#include <xenia/core.h>
+
+#include <xenia/kernel/export.h>
+#include <xenia/kernel/kernel_module.h>
+
+
+namespace xe {
+namespace kernel {
+namespace xam {
+
+
+class XamState {
+public:
+  XamState(xe_pal_ref pal, xe_memory_ref memory,
+           shared_ptr<ExportResolver> export_resolver);
+  ~XamState();
+
+  xe_pal_ref    pal;
+  xe_memory_ref memory;
+
+private:
+  shared_ptr<ExportResolver> export_resolver_;
+};
+
+
+}  // namespace xam
+}  // namespace kernel
+}  // namespace xe
+
+
+#endif  // XENIA_KERNEL_MODULES_XAM_XAM_STATE_H_