Author: greatlrd Date: Thu Jun 22 00:36:59 2006 New Revision: 22488
URL: http://svn.reactos.ru/svn/reactos?rev=22488&view=rev Log: Start adding qemu-system-arm support.
Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe trunk/tools/Qemu GUI/frmMain.cs
Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22488&a... ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Thu Jun 22 00:36:59 2006 @@ -14,7 +14,11 @@ x86 = 0, x86_ISA, x64, - x64_ISA + x64_ISA, + ARM_integratorcp926, + ARM_integratorcp1026, + ARM_versatilepb, + ARM_versatileab }
[XmlRoot("Settings")] @@ -72,6 +76,7 @@ return m_LastError; }
+ public bool MountImage() { Process p = new Process(); @@ -138,7 +143,14 @@ break; case Platforms.x64_ISA: p.StartInfo.FileName = this.Paths.QEmu + "\qemu-system-x86_64.exe"; - break; + break; + case Platforms.ARM_integratorcp926: + case Platforms.ARM_integratorcp1026: + case Platforms.ARM_versatilepb: + case Platforms.ARM_versatileab: + p.StartInfo.FileName = this.Paths.QEmu + "\qemu-system-arm.exe"; + break; + }
p.StartInfo.WorkingDirectory = this.Paths.QEmu; @@ -381,6 +393,20 @@ case Platforms.x64_ISA: buffer += "-M isapc "; break; + case Platforms.ARM_integratorcp926: + buffer += "-M integratorcp926 "; + break; + + case Platforms.ARM_integratorcp1026: + buffer += "-M integratorcp1026 "; + break; + + case Platforms.ARM_versatilepb: + buffer += "-M versatilepb "; + break; + case Platforms.ARM_versatileab: + buffer += "-M versatileab "; + break; }
/* Boot options */
Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%20... ============================================================================== Binary files - no diff available.
Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=2248... ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Thu Jun 22 00:36:59 2006 @@ -223,6 +223,7 @@ this.btnMount = new System.Windows.Forms.Button(); this.lblImage = new System.Windows.Forms.Label(); this.groupBox9 = new System.Windows.Forms.GroupBox(); + this.lblImageSizeMB = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.txtImageSize = new System.Windows.Forms.TextBox(); this.lblImageSize = new System.Windows.Forms.Label(); @@ -273,7 +274,6 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); - this.lblImageSizeMB = new System.Windows.Forms.Label(); this.grpMachine.SuspendLayout(); this.HardDisk2.SuspendLayout(); this.tabMisc.SuspendLayout(); @@ -327,7 +327,11 @@ "Standard PC 32Bit", "ISA only PC 32Bit", "Standard PC 64Bit", - "ISA only PC 64Bit"}); + "ISA only PC 64Bit", + "ARM Integrator/CP (ARM926EJ-S) ", + "ARM Integrator/CP (ARM1026EJ-S)", + "ARM Versatile/PB (ARM926EJ-S)", + "ARM Versatile/AB (ARM926EJ-S)"}); this.cboMachine.Location = new System.Drawing.Point(19, 19); this.cboMachine.Name = "cboMachine"; this.cboMachine.Size = new System.Drawing.Size(239, 21); @@ -952,6 +956,15 @@ this.groupBox9.TabStop = false; this.groupBox9.Text = "Harddisk Tools"; // + // lblImageSizeMB + // + this.lblImageSizeMB.AutoSize = true; + this.lblImageSizeMB.Location = new System.Drawing.Point(83, 42); + this.lblImageSizeMB.Name = "lblImageSizeMB"; + this.lblImageSizeMB.Size = new System.Drawing.Size(23, 13); + this.lblImageSizeMB.TabIndex = 8; + this.lblImageSizeMB.Text = "MB"; + // // label11 // this.label11.Location = new System.Drawing.Point(125, 24); @@ -1414,15 +1427,6 @@ this.btnSave.TabIndex = 6; this.btnSave.Text = "Save"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // lblImageSizeMB - // - this.lblImageSizeMB.AutoSize = true; - this.lblImageSizeMB.Location = new System.Drawing.Point(83, 42); - this.lblImageSizeMB.Name = "lblImageSizeMB"; - this.lblImageSizeMB.Size = new System.Drawing.Size(23, 13); - this.lblImageSizeMB.TabIndex = 8; - this.lblImageSizeMB.Text = "MB"; // // frmMain //