Merge 8f6f16b0e8 into 47ae413908

include/avm.h

@@ -0,0 +1,12 @@
+#pragma once
+
+/**
+ * \defgroup avm avm
+ *
+ * Audio/Video Manager
+ */
+
+#include <avm/cec.h>
+#include <avm/config.h>
+#include <avm/drc.h>
+#include <avm/tv.h>

include/avm/avm.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup avm avm
- *
- * Audio/Video Manager
- */

include/camera.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include <camera/camera.h>

include/coreinit.h

@@ -0,0 +1,71 @@
+#pragma once
+
+/**
+ * \defgroup coreinit coreinit
+ *
+ * Contains all core operating system functions such as threads, synchronisation
+ * objects, filesystem, memory, exception handling, etc...
+ */
+
+#include <coreinit/alarm.h>
+#include <coreinit/atomic.h>
+#include <coreinit/atomic64.h>
+#include <coreinit/bsp.h>
+#include <coreinit/cache.h>
+#include <coreinit/codegen.h>
+#include <coreinit/condition.h>
+#include <coreinit/context.h>
+#include <coreinit/copydata.h>
+#include <coreinit/core.h>
+#include <coreinit/coroutine.h>
+#include <coreinit/cosreport.h>
+#include <coreinit/debug.h>
+#include <coreinit/dynload.h>
+#include <coreinit/energysaver.h>
+#include <coreinit/event.h>
+#include <coreinit/exception.h>
+#include <coreinit/exit.h>
+#include <coreinit/fastcondition.h>
+#include <coreinit/fastmutex.h>
+#include <coreinit/fiber.h>
+#include <coreinit/filesystem.h>
+#include <coreinit/filesystem_fsa.h>
+#include <coreinit/foreground.h>
+#include <coreinit/im.h>
+#include <coreinit/internal.h>
+#include <coreinit/interrupts.h>
+#include <coreinit/ios.h>
+#include <coreinit/ipcbufpool.h>
+#include <coreinit/kernel.h>
+#include <coreinit/launch.h>
+#include <coreinit/mcp.h>
+#include <coreinit/memallocator.h>
+#include <coreinit/memblockheap.h>
+#include <coreinit/memdefaultheap.h>
+#include <coreinit/memexpheap.h>
+#include <coreinit/memfrmheap.h>
+#include <coreinit/memheap.h>
+#include <coreinit/memlist.h>
+#include <coreinit/memory.h>
+#include <coreinit/memorymap.h>
+#include <coreinit/memunitheap.h>
+#include <coreinit/messagequeue.h>
+#include <coreinit/mutex.h>
+#include <coreinit/performancemonitor.h>
+#include <coreinit/rendezvous.h>
+#include <coreinit/savedframe.h>
+#include <coreinit/scheduler.h>
+#include <coreinit/screen.h>
+#include <coreinit/semaphore.h>
+#include <coreinit/smd.h>
+#include <coreinit/spinlock.h>
+#include <coreinit/stopwatch.h>
+#include <coreinit/stopwatchatomic.h>
+#include <coreinit/systeminfo.h>
+#include <coreinit/taskqueue.h>
+#include <coreinit/thread.h>
+#include <coreinit/threadqueue.h>
+#include <coreinit/time.h>
+#include <coreinit/title.h>
+#include <coreinit/transition.h>
+#include <coreinit/userconfig.h>

include/coreinit/coreinit.dox

@@ -1,6 +0,0 @@
-/**
- * \defgroup coreinit coreinit
- *
- * Contains all core operating system functions such as threads, synchronisation
- * objects, filesystem, memory, exception handling, etc...
- */

include/dmae.h

@@ -0,0 +1,9 @@
+#pragma once
+
+/**
+ * \defgroup dmae dmae
+ * DMA Engine.
+*/
+
+#include <dmae/mem.h>
+#include <dmae/sync.h>

include/dmae/dmae.dox

@@ -1,4 +0,0 @@
-/**
- * \defgroup dmae dmae
- * DMA Engine.
-*/

include/gx2.h

@@ -0,0 +1,28 @@
+#pragma once
+
+/**
+ * \defgroup gx2 gx2
+ * Graphics driver.
+ */
+
+#include <gx2/aperture.h>
+#include <gx2/clear.h>
+#include <gx2/context.h>
+#include <gx2/debug.h>
+#include <gx2/display.h>
+#include <gx2/displaylist.h>
+#include <gx2/draw.h>
+#include <gx2/enum.h>
+#include <gx2/event.h>
+#include <gx2/mem.h>
+#include <gx2/registers.h>
+#include <gx2/sampler.h>
+#include <gx2/semaphore.h>
+#include <gx2/shaders.h>
+#include <gx2/state.h>
+#include <gx2/surface.h>
+#include <gx2/swap.h>
+#include <gx2/temp.h>
+#include <gx2/tessellation.h>
+#include <gx2/texture.h>
+#include <gx2/utils.h>

include/gx2/gx2.dox

@@ -1,4 +0,0 @@
-/**
- * \defgroup gx2 gx2
- * Graphics driver.
- */

include/gx2r.h

@@ -0,0 +1,14 @@
+#pragma once
+
+/**
+ * \defgroup gx2r gx2r
+ *
+ * Contains utilities to help manage memory invalidation for gx2.
+ */
+
+#include <gx2r/buffer.h>
+#include <gx2r/displaylist.h>
+#include <gx2r/draw.h>
+#include <gx2r/mem.h>
+#include <gx2r/resource.h>
+#include <gx2r/surface.h>

include/gx2r/gx2r.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup gx2r gx2r
- *
- * Contains utilities to help manage memory invalidation for gx2.
- */

include/h264.h

@@ -0,0 +1,10 @@
+#pragma once
+
+/**
+ * \defgroup h264 h264
+ *
+ * H264 Decoder.
+ */
+
+#include <h264/decode.h>
+#include <h264/stream.h>

include/mic.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#include <mic/mic.h>

include/nfc.h

@@ -1,4 +1,8 @@
+#pragma once
+
 /**
  * \defgroup nfc nfc
  * Near Field Communication (NFC).
  */
+
+#include <nfc/nfc.h>

include/nsysccr.h

@@ -0,0 +1,14 @@
+#pragma once
+
+/**
+ * \defgroup nsysccr nsysccr
+ *
+ * 
+ */
+
+#include <nsysccr/ccr.h>
+#include <nsysccr/cdc.h>
+#include <nsysccr/cfg.h>
+#include <nsysccr/hid.h>
+#include <nsysccr/irda.h>
+#include <nsysccr/nfc.h>

include/nsysccr/nsysccr.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup nsysccr nsysccr
- *
- * 
- */

include/nsyshid.h

@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup nsyshid nsyshid
  *
  * Human Input Device functions.
  */
+
+#include <nsyshid/hid.h>

include/nsyskbd.h

@@ -0,0 +1,9 @@
+#pragma once
+
+/**
+ * \defgroup nsyskbd nsyskbd
+ *
+ * USB HID keyboard.
+ */
+
+#include <nsyskbd/nsyskbd.h>

include/nsyskbd/nsyskbd.h

@@ -2,6 +2,13 @@
 
 #include <wut.h>
 
+/**
+ * \defgroup nsyskbd_nsyskbd
+ * \ingroup nsyskbd
+ *
+ * @{
+ */
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/nsysnet.h

@@ -0,0 +1,11 @@
+#pragma once
+
+/**
+ * \defgroup nsysnet nsysnet
+ *
+ * Network functions.
+ */
+
+#include <nsysnet/misc.h>
+#include <nsysnet/netconfig.h>
+#include <nsysnet/nssl.h>

include/nsysnet/nsysnet.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup nsysnet nsysnet
- *
- * Network functions.
- */

include/nsysuhs.h

@@ -0,0 +1,9 @@
+#pragma once
+
+/**
+ * \defgroup nsysuhs nsysuhs
+ *
+ */
+
+#include <nsysuhs/uhs.h>
+#include <nsysuhs/uhs_usbspec.h>

include/nsysuhs/nsysuhs.dox

@@ -1,4 +0,0 @@
-/**
- * \defgroup nsysuhs nsysuhs
- *
- */

include/ntag.h

@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup ntag ntag
  * Nintendo? Tag (NTAG).
  * NFC library for Amiibo and Pokemon Rumble U.
  */
+
+#include <ntag/ntag.h>

include/padscore.h

@@ -0,0 +1,12 @@
+#pragma once
+
+/**
+ * \defgroup padscore padscore
+ *
+ * Input library for Wii controllers.
+ */
+
+#include <padscore/kpad.h>
+#include <padscore/wbc.h>
+#include <padscore/wpad.h>
+#include <padscore/wud.h>

include/padscore/padscore.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup padscore padscore
- *
- * Input library for Wii controllers.
- */

include/proc_ui.h

@@ -1,6 +1,11 @@
+#pragma once
+
 /**
  * \defgroup proc_ui proc_ui
  *
  * Process management library used for managing transitions between foreground
  * and background applications.
  */
+
+#include <proc_ui/memory.h>
+#include <proc_ui/procui.h>

include/sndcore2.h

@@ -0,0 +1,14 @@
+#pragma once
+
+/**
+ * \defgroup sndcore2 sndcore2
+ *
+ * Sound playback and utility library.
+ */
+
+#include <sndcore2/core.h>
+#include <sndcore2/device.h>
+#include <sndcore2/drcvs.h>
+#include <sndcore2/result.h>
+#include <sndcore2/rmt.h>
+#include <sndcore2/voice.h>

include/sndcore2/sndcore2.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup sndcore2 sndcore2
- *
- * Sound playback and utility library.
- */

include/sysapp.h

@@ -1,6 +1,13 @@
+#pragma once
+
 /**
  * \defgroup sysapp sysapp
  *
  * Functions to switch applications, launch overlay apps and perform other
  * multitasking functions.
  */
+
+#include <sysapp/args.h>
+#include <sysapp/launch.h>
+#include <sysapp/switch.h>
+#include <sysapp/title.h>

include/tve.h

@@ -0,0 +1,10 @@
+#pragma once
+
+/**
+ * \defgroup tve tve
+ *
+ * TV Encoder
+ */
+
+#include <tve/cec.h>
+#include <tve/tve.h>

include/tve/tve.dox

@@ -1,5 +0,0 @@
-/**
- * \defgroup tve tve
- *
- * TV Encoder
- */

include/vpad.h

@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup vpad vpad
  *
  * Input library for the Wii U Gamepad (Display Remote Controller).
  */
+
+#include <vpad/input.h>

include/vpadbase.h

@@ -1,5 +1,9 @@
+#pragma once
+
 /**
  * \defgroup vpadbase vpadbase
  *
  * Wii U Gamepad base library.
  */
+
+#include <vpadbase/base.h>

tests/test_compile_headers_common/test_compile_headers_list.h

@@ -1,11 +1,14 @@
 #include <wut.h>
 #include <wut_structsize.h>
 #include <wut_types.h>
+#include <avm.h>
 #include <avm/cec.h>
 #include <avm/config.h>
 #include <avm/drc.h>
 #include <avm/tv.h>
+#include <camera.h>
 #include <camera/camera.h>
+#include <coreinit.h>
 #include <coreinit/alarm.h>
 #include <coreinit/atomic.h>
 #include <coreinit/atomic64.h>
@@ -67,8 +70,10 @@
 #include <coreinit/title.h>
 #include <coreinit/transition.h>
 #include <coreinit/userconfig.h>
+#include <dmae.h>
 #include <dmae/mem.h>
 #include <dmae/sync.h>
+#include <gx2.h>
 #include <gx2/aperture.h>
 #include <gx2/clear.h>
 #include <gx2/context.h>
@@ -89,15 +94,19 @@
 #include <gx2/tessellation.h>
 #include <gx2/texture.h>
 #include <gx2/utils.h>
+#include <gx2r.h>
 #include <gx2r/buffer.h>
 #include <gx2r/displaylist.h>
 #include <gx2r/draw.h>
 #include <gx2r/mem.h>
 #include <gx2r/resource.h>
 #include <gx2r/surface.h>
+#include <h264.h>
 #include <h264/decode.h>
 #include <h264/stream.h>
+#include <mic.h>
 #include <mic/mic.h>
+#include <nfc.h>
 #include <nfc/nfc.h>
 #include <nn/ac.h>
 #include <nn/ac/ac_c.h>
@@ -142,37 +151,49 @@
 #include <nn/temp.h>
 #include <nn/temp/temp.h>
 #include <nn/uds.h>
+#include <nsysccr.h>
 #include <nsysccr/ccr.h>
 #include <nsysccr/cdc.h>
 #include <nsysccr/cfg.h>
 #include <nsysccr/hid.h>
 #include <nsysccr/irda.h>
 #include <nsysccr/nfc.h>
+#include <nsyshid.h>
 #include <nsyshid/hid.h>
 #include <nsyskbd/nsyskbd.h>
+#include <nsysnet.h>
 #include <nsysnet/_socket.h>
 #include <nsysnet/misc.h>
 #include <nsysnet/netconfig.h>
 #include <nsysnet/nssl.h>
+#include <nsysuhs.h>
 #include <nsysuhs/uhs.h>
+#include <ntag.h>
 #include <ntag/ntag.h>
+#include <padscore.h>
 #include <padscore/kpad.h>
 #include <padscore/wbc.h>
 #include <padscore/wpad.h>
 #include <padscore/wud.h>
+#include <proc_ui.h>
 #include <proc_ui/memory.h>
 #include <proc_ui/procui.h>
+#include <sndcore2.h>
 #include <sndcore2/core.h>
 #include <sndcore2/device.h>
 #include <sndcore2/drcvs.h>
 #include <sndcore2/result.h>
 #include <sndcore2/voice.h>
 #include <swkbd/rpl_interface.h>
+#include <sysapp.h>
 #include <sysapp/args.h>
 #include <sysapp/launch.h>
 #include <sysapp/switch.h>
 #include <sysapp/title.h>
+#include <tve.h>
 #include <tve/cec.h>
 #include <tve/tve.h>
+#include <vpad.h>
 #include <vpad/input.h>
+#include <vpadbase.h>
 #include <vpadbase/base.h>