nvnet: Move to hw/xbox/mcpx/nvnet

2025-12-01 16:10:01 +00:00 · 2025-06-03 19:17:09 -07:00
parent 9a2956aec9
commit 9c97274044
9 changed files with 4 additions and 3 deletions
--- a/hw/xbox/mcpx/meson.build
+++ b/hw/xbox/mcpx/meson.build
@ -3,5 +3,6 @@ mcpx_ss = ss.source_set()
 mcpx_ss.add(files('aci.c'))

 subdir('apu')
+subdir('nvnet')

 specific_ss.add_all(mcpx_ss)
--- a/hw/xbox/mcpx/nvnet/meson.build
+++ b/hw/xbox/mcpx/nvnet/meson.build
@ -0,0 +1 @@
+mcpx_ss.add(files('nvnet.c'))
--- a/hw/xbox/mcpx/nvnet/nvnet.c
+++ b/hw/xbox/mcpx/nvnet/nvnet.c
--- a/hw/xbox/mcpx/nvnet/nvnet_regs.h
+++ b/hw/xbox/mcpx/nvnet/nvnet_regs.h
--- a/hw/xbox/mcpx/nvnet/trace-events
+++ b/hw/xbox/mcpx/nvnet/trace-events
--- a/hw/xbox/mcpx/nvnet/trace.h
+++ b/hw/xbox/mcpx/nvnet/trace.h
@ -0,0 +1 @@
+#include "trace/trace-hw_xbox_mcpx_nvnet.h"
--- a/hw/xbox/meson.build
+++ b/hw/xbox/meson.build
@ -5,7 +5,6 @@ specific_ss.add(files(
 	# 'chihiro.c',
 	'eeprom_generation.c',
 	'lpc47m157.c',
-	'nvnet.c',
 	'smbus_adm1032.c',
 	'smbus_cx25871.c',
 	'smbus_fs454.c',
--- a/hw/xbox/trace.h
+++ b/hw/xbox/trace.h
@ -1 +0,0 @@
-#include "trace/trace-hw_xbox.h"
--- a/meson.build
+++ b/meson.build
@ -3773,7 +3773,7 @@ if have_system
    'hw/xbox/nv2a',
    'hw/xbox/mcpx/apu',
    'hw/xbox/mcpx/apu/dsp',
-    'hw/xbox',
+    'hw/xbox/mcpx/nvnet',
  ]
 endif
 if have_system or have_user