Skip to content

Commit ae8239c

Browse files
tommojphillipstommojphillips
committed
fixed up some issues.
1 parent e9334fa commit ae8239c

File tree

6 files changed

+32
-64
lines changed

6 files changed

+32
-64
lines changed

‎App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
6-
</configuration>
6+
</configuration>

‎Program.cs

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,6 @@ private static void Main(string[] args)
1616
{
1717
init();
1818

19-
20-
#if TEST_ENV // test vars
21-
22-
string xemuDir = $"{Environment.GetFolderPath(Environment.SpecialFolder.Desktop)}\\ogx_dev\\xemu";
23-
Environment.SetEnvironmentVariable("XEMU_DIR", xemuDir);
24-
25-
//Environment.SetEnvironmentVariable("XEMU_CFG", "D:\\xbox\\public\\xbuildtools\\xemu\\cfg\\xemu.toml");
26-
Environment.SetEnvironmentVariable("XEMU_CFG", $"{xemuDir}\\cfg\\xemu.toml");
27-
28-
Environment.SetEnvironmentVariable("XEMU_SERIAL", "1");
29-
30-
Environment.SetEnvironmentVariable("XEMU_MCPX", "boot\\mcpx_1.0.bin");
31-
32-
//Environment.SetEnvironmentVariable("XEMU_EEPROM", "eeprom\\eeprom.bin");
33-
34-
//Environment.SetEnvironmentVariable("XEMU_BIOS", "D:\\builds\\fre\\boot\\xboxrom.bin");
35-
Environment.SetEnvironmentVariable("XEMU_BIOS", "bios\\d_4627.bin");
36-
37-
//Environment.SetEnvironmentVariable("XEMU_DVD", "null");
38-
//Environment.SetEnvironmentVariable("XEMU_DVD", "D:\\builds\\fre\\dump\\EEPROMdumpp.iso");
39-
40-
Environment.SetEnvironmentVariable("XEMU_HDD", "hdd\\hdd.qcow2");
41-
42-
Environment.SetEnvironmentVariable("XEMU_SIZE", "640x480");
43-
Environment.SetEnvironmentVariable("XEMU_MEM", "64");
44-
45-
Environment.SetEnvironmentVariable("XEMU_POS", "2");
46-
47-
Environment.SetEnvironmentVariable("XEMU_SKIP_ANI", "1");
48-
49-
Environment.SetEnvironmentVariable("PATH", Environment.ExpandEnvironmentVariables("%PATH%;D:\\xbox\\public\\idw"));
50-
51-
#endif
52-
5319
config = new StartXEMU();
5420

5521
try
@@ -61,12 +27,6 @@ private static void Main(string[] args)
6127
{
6228
Console.WriteLine("Error: " + e.Message);
6329
Environment.ExitCode = 1;
64-
65-
#if TEST_ENV
66-
Console.WriteLine("Press any key to exit...");
67-
Console.ReadLine();
68-
#endif
69-
7030
}
7131

7232
cleanup();
@@ -93,10 +53,6 @@ private static void parseArgs(string[] args)
9353
{
9454
case "-?":
9555
printHelp();
96-
#if TEST_ENV
97-
Console.WriteLine("Press any key to exit...");
98-
Console.ReadLine();
99-
#endif
10056
Environment.Exit(0);
10157
return;
10258

@@ -106,6 +62,7 @@ private static void parseArgs(string[] args)
10662
switches.ls = true;
10763
switches.lsSection = args[i + 1];
10864
}
65+
10966
return;
11067

11168
case "-cmd":
@@ -115,6 +72,7 @@ private static void parseArgs(string[] args)
11572
switches.cmd = args[i + 1];
11673
i++;
11774
}
75+
11876
break;
11977

12078
case "-qemu_cli":

‎Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.3.0.1")]
36+
[assembly: AssemblyFileVersion("1.3.0.2")]

‎StartXEMU.cs

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public class StartXEMU
3232
private int serial;
3333
private Process xemuProc;
3434
private Process cmdProc;
35-
private Thread cmdThread;
3635

3736
private bool startupSizeOk = false;
3837
private XSwitch sw;
@@ -102,8 +101,18 @@ public void startXEMU()
102101
// add config path override switch
103102
args.Append($"-config_path {cfg}");
104103

105-
if (serial > 0) // add serial stdio switch
106-
args.Append(" -s -device lpc47m157 -serial stdio");
104+
switch (serial)
105+
{
106+
case 1:
107+
args.Append(" -s -device lpc47m157 -serial stdio");
108+
break;
109+
case 2:
110+
args.Append(" -s -device lpc47m157 -serial COM2");
111+
break;
112+
case 3:
113+
args.Append(" -s -device lpc47m157 -serial tcp::4444,server,nowait");
114+
break;
115+
}
107116

108117
xemuProc.StartInfo.FileName = exe;
109118
xemuProc.StartInfo.Arguments = args.ToString();
@@ -119,6 +128,9 @@ public void startXEMU()
119128

120129
// wait for xemu window to be created.
121130
xemuProc.WaitForInputIdle();
131+
132+
// force focus on xemu window
133+
NativeMethods.SetForegroundWindow(xemuProc.MainWindowHandle);
122134

123135
if (startupSizeOk && startupPosition > 0)
124136
{
@@ -260,7 +272,7 @@ public void updateConfig(string[] lines)
260272
case "mem_limit":
261273
// only 64 and 128.
262274

263-
if (!Int32.TryParse(var.Trim(), out int mem) || (mem != 64 && mem != 128))
275+
if (!int.TryParse(var.Trim(), out int mem) || (mem != 64 && mem != 128))
264276
var = "64";
265277
varStr = var + "MB";
266278
break;
@@ -283,6 +295,7 @@ public void updateConfig(string[] lines)
283295
varStr = var;
284296
break;
285297
}
298+
286299
break;
287300

288301
case "bootrom_path":
@@ -306,11 +319,8 @@ public void updateConfig(string[] lines)
306319

307320
case "skip_boot_anim":
308321
// only true or false
309-
Int32.TryParse(var, out int skipAni);
310-
if (skipAni > 0)
311-
var = "true";
312-
else
313-
var = "false";
322+
int.TryParse(var, out int skipAni);
323+
var = skipAni > 0 ? "true" : "false";
314324
varStr = var;
315325
break;
316326
}
@@ -415,12 +425,12 @@ public void getEnv()
415425
// XEMU_SERIAL
416426
if (checkVar("XEMU_SERIAL", out string serialStr))
417427
{
418-
if (!Int32.TryParse(serialStr.Trim(), out serial))
428+
if (!int.TryParse(serialStr.Trim(), out serial))
419429
{
420430
serial = 0;
421431
}
422432

423-
serial = Math.Min(Math.Max(serial, 0), 2);
433+
serial = Math.Min(Math.Max(serial, 0), 3);
424434
}
425435

426436
// XEMU_DVD
@@ -433,7 +443,7 @@ public void getEnv()
433443
// XEMU_POS
434444
if (checkVar("XEMU_POS", out string pos))
435445
{
436-
if (!Int32.TryParse(pos, out startupPosition))
446+
if (!int.TryParse(pos, out startupPosition))
437447
{
438448
startupPosition = 0;
439449
}
@@ -451,8 +461,8 @@ public void getEnv()
451461
size = "640x480";
452462

453463
string[] res = size.Split('x');
454-
startupWidth = Int32.Parse(res[0]);
455-
startupHeight = Int32.Parse(res[1]);
464+
startupWidth = int.Parse(res[0]);
465+
startupHeight = int.Parse(res[1]);
456466
}
457467
}
458468
public void getDefaultConfig()

‎StartXemu.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>StartXemu</RootNamespace>
1010
<AssemblyName>startxemu</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup>
1718
<StartupObject>StartXemu.Program</StartupObject>

‎XSetting.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ public XSetting(string section, string var, bool valueQuoted = true, string defa
1515
this.defaultValue = defaultValue;
1616

1717
}
18-
1918
}
2019
}

0 commit comments

Comments
 (0)