chaos-svn Mailing List for The chaos Operating System (Page 6)
Status: Pre-Alpha
Brought to you by:
sf_hal
Menu
▾
▴
chaos-svn — chaos SVN commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(83) |
Apr
(43) |
May
(1) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(1) |
Oct
(4) |
Nov
|
Dec
(4) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(7) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sf...@us...> - 2007-03-16 18:16:50
|
Revision: 1248
http://chaos.svn.sourceforge.net/chaos/?rev=1248&view=rev
Author: sf_hal
Date: 2007-03-16 11:16:46 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Further minor fixes.
Modified Paths:
--------------
trunk/chaos.net/Chaos.Service/ServiceManager.cs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 18:16:04
|
Revision: 1247
http://chaos.svn.sourceforge.net/chaos/?rev=1247&view=rev
Author: sf_hal
Date: 2007-03-16 11:16:02 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
A first go at a console server. This is the one providing a "screen" (or several actually). It is also responsible for routing keyboard, mouse etc to the active application. In this case, mouse and keyboard handling will not be done in separate server but rather all in this server I think.
Added Paths:
-----------
trunk/chaos.net/Applications/Cluido/Cluido.csproj
trunk/chaos.net/Applications/Cluido/Program.cs
trunk/chaos.net/Applications/Cluido/Properties/
trunk/chaos.net/Applications/Cluido/Properties/AssemblyInfo.cs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 16:19:38
|
Revision: 1245
http://chaos.svn.sourceforge.net/chaos/?rev=1245&view=rev
Author: sf_hal
Date: 2007-03-16 09:19:18 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/chaos.net/Chaos.Service/ServiceManager.cs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 16:19:06
|
Revision: 1244
http://chaos.svn.sourceforge.net/chaos/?rev=1244&view=rev
Author: sf_hal
Date: 2007-03-16 09:19:03 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Moved files common to both Storm.NET and Chaos.Service.
Removed Paths:
-------------
trunk/chaos.net/Storm.NET/IPCMessage.cs
trunk/chaos.net/Storm.NET/IPCMessageArgument.cs
trunk/chaos.net/Storm.NET/Storm.NET.csproj.user
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 16:17:07
|
Revision: 1243
http://chaos.svn.sourceforge.net/chaos/?rev=1243&view=rev
Author: sf_hal
Date: 2007-03-16 09:16:56 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Initial checkin of the Chaos.IPC library used by both Storm.NET and Chaos.Service.
Added Paths:
-----------
trunk/chaos.net/Chaos.IPC/
trunk/chaos.net/Chaos.IPC/Chaos.IPC.csproj
trunk/chaos.net/Chaos.IPC/Chaos.IPC.sln
trunk/chaos.net/Chaos.IPC/Chaos.IPC.suo
trunk/chaos.net/Chaos.IPC/IPCMessage.cs
trunk/chaos.net/Chaos.IPC/IPCMessageArgument.cs
trunk/chaos.net/Chaos.IPC/Properties/
trunk/chaos.net/Chaos.IPC/Properties/AssemblyInfo.cs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 15:23:32
|
Revision: 1242
http://chaos.svn.sourceforge.net/chaos/?rev=1242&view=rev
Author: sf_hal
Date: 2007-03-16 08:23:29 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Removed Paths:
-------------
trunk/chaos.net/Storm.NET/Form1.Designer.cs
trunk/chaos.net/Storm.NET/Form1.cs
trunk/chaos.net/Storm.NET/Form1.resx
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 15:22:56
|
Revision: 1241
http://chaos.svn.sourceforge.net/chaos/?rev=1241&view=rev
Author: sf_hal
Date: 2007-03-16 08:22:53 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/chaos.net/Storm.NET/Storm.NET.csproj.user
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-16 15:22:27
|
Revision: 1240
http://chaos.svn.sourceforge.net/chaos/?rev=1240&view=rev
Author: sf_hal
Date: 2007-03-16 08:22:21 -0700 (Fri, 16 Mar 2007)
Log Message:
-----------
Added IPC message handling and some threads to handle incoming connections from applications using Chaos.Service. This is not yet working, but I don't have any more time today.
Modified Paths:
--------------
trunk/chaos.net/Storm.NET/Program.cs
trunk/chaos.net/Storm.NET/Properties/Resources.Designer.cs
trunk/chaos.net/Storm.NET/Properties/Settings.Designer.cs
trunk/chaos.net/Storm.NET/Storm.NET.csproj
trunk/chaos.net/Storm.NET/Storm.NET.suo
Added Paths:
-----------
trunk/chaos.net/Storm.NET/ClientConnection.cs
trunk/chaos.net/Storm.NET/ConnectionListener.cs
trunk/chaos.net/Storm.NET/IPCMessage.cs
trunk/chaos.net/Storm.NET/IPCMessageArgument.cs
trunk/chaos.net/Storm.NET/MainWindow.Designer.cs
trunk/chaos.net/Storm.NET/MainWindow.cs
trunk/chaos.net/Storm.NET/MainWindow.resx
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-15 14:46:13
|
Revision: 1239
http://chaos.svn.sourceforge.net/chaos/?rev=1239&view=rev
Author: sf_hal
Date: 2007-03-15 07:46:12 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Changed some naming.
Modified Paths:
--------------
trunk/chaos.net/Storm.NET/Form1.Designer.cs
trunk/chaos.net/Storm.NET/Form1.cs
trunk/chaos.net/Storm.NET/Program.cs
trunk/chaos.net/Storm.NET/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/chaos.net/Storm.NET/Storm.NET.csproj
trunk/chaos.net/Storm.NET/Storm.NET.sln
trunk/chaos.net/Storm.NET/Storm.NET.suo
Removed Paths:
-------------
trunk/chaos.net/Storm.NET/Storm.csproj
trunk/chaos.net/Storm.NET/Storm.sln
trunk/chaos.net/Storm.NET/Storm.suo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-15 14:39:16
|
Revision: 1238
http://chaos.svn.sourceforge.net/chaos/?rev=1238&view=rev
Author: sf_hal
Date: 2007-03-15 07:39:12 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Added more to the empty skeleton classes and separated each class into its own file.
Modified Paths:
--------------
trunk/chaos.net/Chaos.Service/AssemblyInfo.cs
trunk/chaos.net/Chaos.Service/Chaos.Service.csproj
Added Paths:
-----------
trunk/chaos.net/Chaos.Service/InvokeResult.cs
trunk/chaos.net/Chaos.Service/ServiceConnection.cs
trunk/chaos.net/Chaos.Service/ServiceIdentifier.cs
trunk/chaos.net/Chaos.Service/ServiceManager.cs
trunk/chaos.net/Chaos.Service/ServiceParameters.cs
Removed Paths:
-------------
trunk/chaos.net/Chaos.Service/MainClass.cs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-15 13:35:32
|
Revision: 1237
http://chaos.svn.sourceforge.net/chaos/?rev=1237&view=rev
Author: perlundberg
Date: 2007-03-15 06:35:30 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
chaos.sln: Added a global chaos solution for compiling everything.
Storm.csproj: Fixed an assembly reference to Chaos.Service, so that Storm.NET can access the classes in the Chaos.Service assembly.
Modified Paths:
--------------
trunk/chaos.net/Storm.NET/Storm.csproj
Added Paths:
-----------
trunk/chaos.net/chaos.sln
Modified: trunk/chaos.net/Storm.NET/Storm.csproj
===================================================================
--- trunk/chaos.net/Storm.NET/Storm.csproj 2007-03-15 13:32:30 UTC (rev 1236)
+++ trunk/chaos.net/Storm.NET/Storm.csproj 2007-03-15 13:35:30 UTC (rev 1237)
@@ -76,5 +76,11 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Chaos.Service\Chaos.Service.csproj">
+ <Project>{B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}</Project>
+ <Name>Chaos.Service</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
Added: trunk/chaos.net/chaos.sln
===================================================================
--- trunk/chaos.net/chaos.sln (rev 0)
+++ trunk/chaos.net/chaos.sln 2007-03-15 13:35:30 UTC (rev 1237)
@@ -0,0 +1,26 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# SharpDevelop 2.0.0.1591
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storm", "Storm.NET\Storm.csproj", "{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chaos.Service", "Chaos.Service\Chaos.Service.csproj", "{B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2C162641-E16C-4E25-82D7-68C1FA0197B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2C162641-E16C-4E25-82D7-68C1FA0197B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2C162641-E16C-4E25-82D7-68C1FA0197B8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2C162641-E16C-4E25-82D7-68C1FA0197B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+EndGlobal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-15 13:32:31
|
Revision: 1236
http://chaos.svn.sourceforge.net/chaos/?rev=1236&view=rev
Author: perlundberg
Date: 2007-03-15 06:32:30 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Deleted the Storm directory altogether.
Removed Paths:
-------------
trunk/chaos.net/Storm.NET/Storm/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-15 13:30:05
|
Revision: 1235
http://chaos.svn.sourceforge.net/chaos/?rev=1235&view=rev
Author: perlundberg
Date: 2007-03-15 06:30:01 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Moved from Storm to the parent directory.
Modified Paths:
--------------
trunk/chaos.net/Storm.NET/Storm.sln
Added Paths:
-----------
trunk/chaos.net/Storm.NET/Form1.Designer.cs
trunk/chaos.net/Storm.NET/Form1.cs
trunk/chaos.net/Storm.NET/Form1.resx
trunk/chaos.net/Storm.NET/Program.cs
trunk/chaos.net/Storm.NET/Properties/
trunk/chaos.net/Storm.NET/Storm.csproj
Removed Paths:
-------------
trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs
trunk/chaos.net/Storm.NET/Storm/Form1.cs
trunk/chaos.net/Storm.NET/Storm/Form1.resx
trunk/chaos.net/Storm.NET/Storm/Program.cs
trunk/chaos.net/Storm.NET/Storm/Properties/
trunk/chaos.net/Storm.NET/Storm/Storm.csproj
Property Changed:
----------------
trunk/chaos.net/Storm.NET/
Property changes on: trunk/chaos.net/Storm.NET
___________________________________________________________________
Name: svn:ignore
+ bin
obj
Copied: trunk/chaos.net/Storm.NET/Form1.Designer.cs (from rev 1234, trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs)
===================================================================
--- trunk/chaos.net/Storm.NET/Form1.Designer.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Form1.Designer.cs 2007-03-15 13:30:01 UTC (rev 1235)
@@ -0,0 +1,201 @@
+namespace Storm
+{
+ partial class Form1
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Services");
+ System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("Clients");
+ System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Connections");
+ System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Storm", new System.Windows.Forms.TreeNode[] {
+ treeNode1,
+ treeNode2,
+ treeNode3});
+ this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+ this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.stormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.startToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.aboutStormNETToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.treeView1 = new System.Windows.Forms.TreeView();
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.statusStrip1.SuspendLayout();
+ this.menuStrip1.SuspendLayout();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // statusStrip1
+ //
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripStatusLabel1});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 507);
+ this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Size = new System.Drawing.Size(687, 22);
+ this.statusStrip1.TabIndex = 0;
+ this.statusStrip1.Text = "statusStrip1";
+ //
+ // toolStripStatusLabel1
+ //
+ this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17);
+ this.toolStripStatusLabel1.Text = "Storm.NET";
+ //
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.stormToolStripMenuItem,
+ this.helpToolStripMenuItem});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(687, 24);
+ this.menuStrip1.TabIndex = 1;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // stormToolStripMenuItem
+ //
+ this.stormToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.startToolStripMenuItem,
+ this.quitToolStripMenuItem});
+ this.stormToolStripMenuItem.Name = "stormToolStripMenuItem";
+ this.stormToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+ this.stormToolStripMenuItem.Text = "&Storm";
+ //
+ // startToolStripMenuItem
+ //
+ this.startToolStripMenuItem.Name = "startToolStripMenuItem";
+ this.startToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
+ this.startToolStripMenuItem.Text = "&Start...";
+ //
+ // quitToolStripMenuItem
+ //
+ this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
+ this.quitToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
+ this.quitToolStripMenuItem.Text = "&Exit";
+ //
+ // helpToolStripMenuItem
+ //
+ this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.aboutStormNETToolStripMenuItem});
+ this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+ this.helpToolStripMenuItem.Text = "&Help";
+ //
+ // aboutStormNETToolStripMenuItem
+ //
+ this.aboutStormNETToolStripMenuItem.Name = "aboutStormNETToolStripMenuItem";
+ this.aboutStormNETToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+ this.aboutStormNETToolStripMenuItem.Text = "&About Storm.NET";
+ //
+ // splitContainer1
+ //
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer1.Location = new System.Drawing.Point(0, 24);
+ this.splitContainer1.Name = "splitContainer1";
+ //
+ // splitContainer1.Panel1
+ //
+ this.splitContainer1.Panel1.Controls.Add(this.treeView1);
+ //
+ // splitContainer1.Panel2
+ //
+ this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
+ this.splitContainer1.Size = new System.Drawing.Size(687, 483);
+ this.splitContainer1.SplitterDistance = 229;
+ this.splitContainer1.TabIndex = 2;
+ //
+ // treeView1
+ //
+ this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.treeView1.Location = new System.Drawing.Point(0, 0);
+ this.treeView1.Name = "treeView1";
+ treeNode1.Name = "Node1";
+ treeNode1.Text = "Services";
+ treeNode2.Name = "Node2";
+ treeNode2.Text = "Clients";
+ treeNode3.Name = "Node3";
+ treeNode3.Text = "Connections";
+ treeNode4.Name = "Node0";
+ treeNode4.Text = "Storm";
+ this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
+ treeNode4});
+ this.treeView1.Size = new System.Drawing.Size(229, 483);
+ this.treeView1.TabIndex = 0;
+ //
+ // richTextBox1
+ //
+ this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.Size = new System.Drawing.Size(454, 483);
+ this.richTextBox1.TabIndex = 0;
+ this.richTextBox1.Text = "";
+ //
+ // Form1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(687, 529);
+ this.Controls.Add(this.splitContainer1);
+ this.Controls.Add(this.statusStrip1);
+ this.Controls.Add(this.menuStrip1);
+ this.MainMenuStrip = this.menuStrip1;
+ this.Name = "Form1";
+ this.Text = "Storm.NET";
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ this.splitContainer1.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.StatusStrip statusStrip1;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
+ private System.Windows.Forms.MenuStrip menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem stormToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem quitToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem aboutStormNETToolStripMenuItem;
+ private System.Windows.Forms.SplitContainer splitContainer1;
+ private System.Windows.Forms.TreeView treeView1;
+ private System.Windows.Forms.RichTextBox richTextBox1;
+
+ }
+}
+
Copied: trunk/chaos.net/Storm.NET/Form1.cs (from rev 1234, trunk/chaos.net/Storm.NET/Storm/Form1.cs)
===================================================================
--- trunk/chaos.net/Storm.NET/Form1.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Form1.cs 2007-03-15 13:30:01 UTC (rev 1235)
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Storm
+{
+ public partial class Form1 : Form
+ {
+ public Form1()
+ {
+ InitializeComponent();
+ }
+
+ }
+}
\ No newline at end of file
Copied: trunk/chaos.net/Storm.NET/Form1.resx (from rev 1234, trunk/chaos.net/Storm.NET/Storm/Form1.resx)
===================================================================
--- trunk/chaos.net/Storm.NET/Form1.resx (rev 0)
+++ trunk/chaos.net/Storm.NET/Form1.resx 2007-03-15 13:30:01 UTC (rev 1235)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>127, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Copied: trunk/chaos.net/Storm.NET/Program.cs (from rev 1234, trunk/chaos.net/Storm.NET/Storm/Program.cs)
===================================================================
--- trunk/chaos.net/Storm.NET/Program.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Program.cs 2007-03-15 13:30:01 UTC (rev 1235)
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace Storm
+{
+ static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new Form1());
+ }
+ }
+}
\ No newline at end of file
Copied: trunk/chaos.net/Storm.NET/Properties (from rev 1234, trunk/chaos.net/Storm.NET/Storm/Properties)
Deleted: trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs 2007-03-15 13:16:03 UTC (rev 1234)
+++ trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs 2007-03-15 13:30:01 UTC (rev 1235)
@@ -1,201 +0,0 @@
-namespace Storm
-{
- partial class Form1
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Services");
- System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("Clients");
- System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Connections");
- System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Storm", new System.Windows.Forms.TreeNode[] {
- treeNode1,
- treeNode2,
- treeNode3});
- this.statusStrip1 = new System.Windows.Forms.StatusStrip();
- this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
- this.menuStrip1 = new System.Windows.Forms.MenuStrip();
- this.stormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.startToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.aboutStormNETToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.treeView1 = new System.Windows.Forms.TreeView();
- this.richTextBox1 = new System.Windows.Forms.RichTextBox();
- this.statusStrip1.SuspendLayout();
- this.menuStrip1.SuspendLayout();
- this.splitContainer1.Panel1.SuspendLayout();
- this.splitContainer1.Panel2.SuspendLayout();
- this.splitContainer1.SuspendLayout();
- this.SuspendLayout();
- //
- // statusStrip1
- //
- this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripStatusLabel1});
- this.statusStrip1.Location = new System.Drawing.Point(0, 507);
- this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(687, 22);
- this.statusStrip1.TabIndex = 0;
- this.statusStrip1.Text = "statusStrip1";
- //
- // toolStripStatusLabel1
- //
- this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
- this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17);
- this.toolStripStatusLabel1.Text = "Storm.NET";
- //
- // menuStrip1
- //
- this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.stormToolStripMenuItem,
- this.helpToolStripMenuItem});
- this.menuStrip1.Location = new System.Drawing.Point(0, 0);
- this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(687, 24);
- this.menuStrip1.TabIndex = 1;
- this.menuStrip1.Text = "menuStrip1";
- //
- // stormToolStripMenuItem
- //
- this.stormToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.startToolStripMenuItem,
- this.quitToolStripMenuItem});
- this.stormToolStripMenuItem.Name = "stormToolStripMenuItem";
- this.stormToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
- this.stormToolStripMenuItem.Text = "&Storm";
- //
- // startToolStripMenuItem
- //
- this.startToolStripMenuItem.Name = "startToolStripMenuItem";
- this.startToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
- this.startToolStripMenuItem.Text = "&Start...";
- //
- // quitToolStripMenuItem
- //
- this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
- this.quitToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
- this.quitToolStripMenuItem.Text = "&Exit";
- //
- // helpToolStripMenuItem
- //
- this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.aboutStormNETToolStripMenuItem});
- this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
- this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
- this.helpToolStripMenuItem.Text = "&Help";
- //
- // aboutStormNETToolStripMenuItem
- //
- this.aboutStormNETToolStripMenuItem.Name = "aboutStormNETToolStripMenuItem";
- this.aboutStormNETToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
- this.aboutStormNETToolStripMenuItem.Text = "&About Storm.NET";
- //
- // splitContainer1
- //
- this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 24);
- this.splitContainer1.Name = "splitContainer1";
- //
- // splitContainer1.Panel1
- //
- this.splitContainer1.Panel1.Controls.Add(this.treeView1);
- //
- // splitContainer1.Panel2
- //
- this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
- this.splitContainer1.Size = new System.Drawing.Size(687, 483);
- this.splitContainer1.SplitterDistance = 229;
- this.splitContainer1.TabIndex = 2;
- //
- // treeView1
- //
- this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.treeView1.Location = new System.Drawing.Point(0, 0);
- this.treeView1.Name = "treeView1";
- treeNode1.Name = "Node1";
- treeNode1.Text = "Services";
- treeNode2.Name = "Node2";
- treeNode2.Text = "Clients";
- treeNode3.Name = "Node3";
- treeNode3.Text = "Connections";
- treeNode4.Name = "Node0";
- treeNode4.Text = "Storm";
- this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
- treeNode4});
- this.treeView1.Size = new System.Drawing.Size(229, 483);
- this.treeView1.TabIndex = 0;
- //
- // richTextBox1
- //
- this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.richTextBox1.Location = new System.Drawing.Point(0, 0);
- this.richTextBox1.Name = "richTextBox1";
- this.richTextBox1.Size = new System.Drawing.Size(454, 483);
- this.richTextBox1.TabIndex = 0;
- this.richTextBox1.Text = "";
- //
- // Form1
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(687, 529);
- this.Controls.Add(this.splitContainer1);
- this.Controls.Add(this.statusStrip1);
- this.Controls.Add(this.menuStrip1);
- this.MainMenuStrip = this.menuStrip1;
- this.Name = "Form1";
- this.Text = "Storm.NET";
- this.statusStrip1.ResumeLayout(false);
- this.statusStrip1.PerformLayout();
- this.menuStrip1.ResumeLayout(false);
- this.menuStrip1.PerformLayout();
- this.splitContainer1.Panel1.ResumeLayout(false);
- this.splitContainer1.Panel2.ResumeLayout(false);
- this.splitContainer1.ResumeLayout(false);
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.StatusStrip statusStrip1;
- private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
- private System.Windows.Forms.MenuStrip menuStrip1;
- private System.Windows.Forms.ToolStripMenuItem stormToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem quitToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem aboutStormNETToolStripMenuItem;
- private System.Windows.Forms.SplitContainer splitContainer1;
- private System.Windows.Forms.TreeView treeView1;
- private System.Windows.Forms.RichTextBox richTextBox1;
-
- }
-}
-
Deleted: trunk/chaos.net/Storm.NET/Storm/Form1.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Form1.cs 2007-03-15 13:16:03 UTC (rev 1234)
+++ trunk/chaos.net/Storm.NET/Storm/Form1.cs 2007-03-15 13:30:01 UTC (rev 1235)
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-
-namespace Storm
-{
- public partial class Form1 : Form
- {
- public Form1()
- {
- InitializeComponent();
- }
-
- }
-}
\ No newline at end of file
Deleted: trunk/chaos.net/Storm.NET/Storm/Form1.resx
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Form1.resx 2007-03-15 13:16:03 UTC (rev 1234)
+++ trunk/chaos.net/Storm.NET/Storm/Form1.resx 2007-03-15 13:30:01 UTC (rev 1235)
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
- <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>127, 17</value>
- </metadata>
-</root>
\ No newline at end of file
Deleted: trunk/chaos.net/Storm.NET/Storm/Program.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Program.cs 2007-03-15 13:16:03 UTC (rev 1234)
+++ trunk/chaos.net/Storm.NET/Storm/Program.cs 2007-03-15 13:30:01 UTC (rev 1235)
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace Storm
-{
- static class Program
- {
- /// <summary>
- /// The main entry point for the application.
- /// </summary>
- [STAThread]
- static void Main()
- {
- Application.EnableVisualStyles();
- Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new Form1());
- }
- }
-}
\ No newline at end of file
Deleted: trunk/chaos.net/Storm.NET/Storm/Storm.csproj
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Storm.csproj 2007-03-15 13:16:03 UTC (rev 1234)
+++ trunk/chaos.net/Storm.NET/Storm/Storm.csproj 2007-03-15 13:30:01 UTC (rev 1235)
@@ -1,78 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}</ProjectGuid>
- <OutputType>WinExe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Storm</RootNamespace>
- <AssemblyName>Storm</AssemblyName>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Deployment" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Form1.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Form1.Designer.cs">
- <DependentUpon>Form1.cs</DependentUpon>
- </Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <EmbeddedResource Include="Form1.resx">
- <SubType>Designer</SubType>
- <DependentUpon>Form1.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
- <None Include="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <Compile Include="Properties\Settings.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- </Compile>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
Copied: trunk/chaos.net/Storm.NET/Storm.csproj (from rev 1234, trunk/chaos.net/Storm.NET/Storm/Storm.csproj)
===================================================================
--- trunk/chaos.net/Storm.NET/Storm.csproj (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm.csproj 2007-03-15 13:30:01 UTC (rev 1235)
@@ -0,0 +1,80 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}</ProjectGuid>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Storm</RootNamespace>
+ <AssemblyName>Storm</AssemblyName>
+ <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ <NoStdLib>False</NoStdLib>
+ <RegisterForComInterop>False</RegisterForComInterop>
+ <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+ <BaseAddress>4194304</BaseAddress>
+ <PlatformTarget>x86</PlatformTarget>
+ <FileAlignment>4096</FileAlignment>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>Full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Deployment" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Form1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Form1.Designer.cs">
+ <DependentUpon>Form1.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <EmbeddedResource Include="Form1.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>Form1.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <None Include="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
+ <Compile Include="Properties\Settings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Settings.settings</DependentUpon>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
Modified: trunk/chaos.net/Storm.NET/Storm.sln
===================================================================
--- trunk/chaos.net/Storm.NET/Storm.sln 2007-03-15 13:16:03 UTC (rev 1234)
+++ trunk/chaos.net/Storm.NET/Storm.sln 2007-03-15 13:30:01 UTC (rev 1235)
@@ -1,7 +1,6 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storm", "Storm\Storm.csproj", "{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}"
+Microsoft Visual Studio Solution File, Format Version 9.00
+# SharpDevelop 2.0.0.1591
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storm", "Storm.csproj", "{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-15 13:16:09
|
Revision: 1234
http://chaos.svn.sourceforge.net/chaos/?rev=1234&view=rev
Author: perlundberg
Date: 2007-03-15 06:16:03 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Added bin/ and obj/ to the ignore list.
Property Changed:
----------------
trunk/chaos.net/Chaos.Service/
Property changes on: trunk/chaos.net/Chaos.Service
___________________________________________________________________
Name: svn:ignore
+ bin
obj
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-15 13:14:04
|
Revision: 1233
http://chaos.svn.sourceforge.net/chaos/?rev=1233&view=rev
Author: perlundberg
Date: 2007-03-15 06:14:02 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Added the Chaos.Service assembly.
Added Paths:
-----------
trunk/chaos.net/Chaos.Service/
trunk/chaos.net/Chaos.Service/AssemblyInfo.cs
trunk/chaos.net/Chaos.Service/Chaos.Service.csproj
trunk/chaos.net/Chaos.Service/Chaos.Service.sln
trunk/chaos.net/Chaos.Service/MainClass.cs
Added: trunk/chaos.net/Chaos.Service/AssemblyInfo.cs
===================================================================
--- trunk/chaos.net/Chaos.Service/AssemblyInfo.cs (rev 0)
+++ trunk/chaos.net/Chaos.Service/AssemblyInfo.cs 2007-03-15 13:14:02 UTC (rev 1233)
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("Chaos.Service")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Chaos.Service")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
Added: trunk/chaos.net/Chaos.Service/Chaos.Service.csproj
===================================================================
--- trunk/chaos.net/Chaos.Service/Chaos.Service.csproj (rev 0)
+++ trunk/chaos.net/Chaos.Service/Chaos.Service.csproj 2007-03-15 13:14:02 UTC (rev 1233)
@@ -0,0 +1,35 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <OutputType>Library</OutputType>
+ <RootNamespace>Chaos.Service</RootNamespace>
+ <AssemblyName>Chaos.Service</AssemblyName>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}</ProjectGuid>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <Optimize>False</Optimize>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugSymbols>True</DebugSymbols>
+ <DebugType>Full</DebugType>
+ <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <Optimize>True</Optimize>
+ <DefineConstants>TRACE</DefineConstants>
+ <DebugSymbols>False</DebugSymbols>
+ <DebugType>None</DebugType>
+ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="MainClass.cs" />
+ <Compile Include="AssemblyInfo.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file
Added: trunk/chaos.net/Chaos.Service/Chaos.Service.sln
===================================================================
--- trunk/chaos.net/Chaos.Service/Chaos.Service.sln (rev 0)
+++ trunk/chaos.net/Chaos.Service/Chaos.Service.sln 2007-03-15 13:14:02 UTC (rev 1233)
@@ -0,0 +1,16 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# SharpDevelop 2.0.0.1591
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chaos.Service", "Chaos.Service.csproj", "{B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B38BA300-40EA-4306-84DB-EF0D2D4D0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+EndGlobal
Added: trunk/chaos.net/Chaos.Service/MainClass.cs
===================================================================
--- trunk/chaos.net/Chaos.Service/MainClass.cs (rev 0)
+++ trunk/chaos.net/Chaos.Service/MainClass.cs 2007-03-15 13:14:02 UTC (rev 1233)
@@ -0,0 +1,21 @@
+/*
+ * Created by SharpDevelop.
+ * User: per
+ * Date: 2007-03-15
+ * Time: 14:12
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections.Generic;
+
+namespace Chaos.Service
+{
+ /// <summary>
+ /// Description of MainClass.
+ /// </summary>
+ public class MainClass
+ {
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sf...@us...> - 2007-03-15 13:12:17
|
Revision: 1232
http://chaos.svn.sourceforge.net/chaos/?rev=1232&view=rev
Author: sf_hal
Date: 2007-03-15 06:12:07 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Initial check in.
Added Paths:
-----------
trunk/chaos.net/Storm.NET/
trunk/chaos.net/Storm.NET/Storm/
trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs
trunk/chaos.net/Storm.NET/Storm/Form1.cs
trunk/chaos.net/Storm.NET/Storm/Form1.resx
trunk/chaos.net/Storm.NET/Storm/Program.cs
trunk/chaos.net/Storm.NET/Storm/Properties/
trunk/chaos.net/Storm.NET/Storm/Properties/AssemblyInfo.cs
trunk/chaos.net/Storm.NET/Storm/Properties/Resources.Designer.cs
trunk/chaos.net/Storm.NET/Storm/Properties/Resources.resx
trunk/chaos.net/Storm.NET/Storm/Properties/Settings.Designer.cs
trunk/chaos.net/Storm.NET/Storm/Properties/Settings.settings
trunk/chaos.net/Storm.NET/Storm/Storm.csproj
trunk/chaos.net/Storm.NET/Storm.sln
trunk/chaos.net/Storm.NET/Storm.suo
Added: trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Form1.Designer.cs 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,201 @@
+namespace Storm
+{
+ partial class Form1
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("Services");
+ System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("Clients");
+ System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("Connections");
+ System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("Storm", new System.Windows.Forms.TreeNode[] {
+ treeNode1,
+ treeNode2,
+ treeNode3});
+ this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+ this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+ this.stormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.startToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.aboutStormNETToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.treeView1 = new System.Windows.Forms.TreeView();
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.statusStrip1.SuspendLayout();
+ this.menuStrip1.SuspendLayout();
+ this.splitContainer1.Panel1.SuspendLayout();
+ this.splitContainer1.Panel2.SuspendLayout();
+ this.splitContainer1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // statusStrip1
+ //
+ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripStatusLabel1});
+ this.statusStrip1.Location = new System.Drawing.Point(0, 507);
+ this.statusStrip1.Name = "statusStrip1";
+ this.statusStrip1.Size = new System.Drawing.Size(687, 22);
+ this.statusStrip1.TabIndex = 0;
+ this.statusStrip1.Text = "statusStrip1";
+ //
+ // toolStripStatusLabel1
+ //
+ this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
+ this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17);
+ this.toolStripStatusLabel1.Text = "Storm.NET";
+ //
+ // menuStrip1
+ //
+ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.stormToolStripMenuItem,
+ this.helpToolStripMenuItem});
+ this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip1.Name = "menuStrip1";
+ this.menuStrip1.Size = new System.Drawing.Size(687, 24);
+ this.menuStrip1.TabIndex = 1;
+ this.menuStrip1.Text = "menuStrip1";
+ //
+ // stormToolStripMenuItem
+ //
+ this.stormToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.startToolStripMenuItem,
+ this.quitToolStripMenuItem});
+ this.stormToolStripMenuItem.Name = "stormToolStripMenuItem";
+ this.stormToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+ this.stormToolStripMenuItem.Text = "&Storm";
+ //
+ // startToolStripMenuItem
+ //
+ this.startToolStripMenuItem.Name = "startToolStripMenuItem";
+ this.startToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
+ this.startToolStripMenuItem.Text = "&Start...";
+ //
+ // quitToolStripMenuItem
+ //
+ this.quitToolStripMenuItem.Name = "quitToolStripMenuItem";
+ this.quitToolStripMenuItem.Size = new System.Drawing.Size(121, 22);
+ this.quitToolStripMenuItem.Text = "&Exit";
+ //
+ // helpToolStripMenuItem
+ //
+ this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.aboutStormNETToolStripMenuItem});
+ this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+ this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+ this.helpToolStripMenuItem.Text = "&Help";
+ //
+ // aboutStormNETToolStripMenuItem
+ //
+ this.aboutStormNETToolStripMenuItem.Name = "aboutStormNETToolStripMenuItem";
+ this.aboutStormNETToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
+ this.aboutStormNETToolStripMenuItem.Text = "&About Storm.NET";
+ //
+ // splitContainer1
+ //
+ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainer1.Location = new System.Drawing.Point(0, 24);
+ this.splitContainer1.Name = "splitContainer1";
+ //
+ // splitContainer1.Panel1
+ //
+ this.splitContainer1.Panel1.Controls.Add(this.treeView1);
+ //
+ // splitContainer1.Panel2
+ //
+ this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
+ this.splitContainer1.Size = new System.Drawing.Size(687, 483);
+ this.splitContainer1.SplitterDistance = 229;
+ this.splitContainer1.TabIndex = 2;
+ //
+ // treeView1
+ //
+ this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.treeView1.Location = new System.Drawing.Point(0, 0);
+ this.treeView1.Name = "treeView1";
+ treeNode1.Name = "Node1";
+ treeNode1.Text = "Services";
+ treeNode2.Name = "Node2";
+ treeNode2.Text = "Clients";
+ treeNode3.Name = "Node3";
+ treeNode3.Text = "Connections";
+ treeNode4.Name = "Node0";
+ treeNode4.Text = "Storm";
+ this.treeView1.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
+ treeNode4});
+ this.treeView1.Size = new System.Drawing.Size(229, 483);
+ this.treeView1.TabIndex = 0;
+ //
+ // richTextBox1
+ //
+ this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.Size = new System.Drawing.Size(454, 483);
+ this.richTextBox1.TabIndex = 0;
+ this.richTextBox1.Text = "";
+ //
+ // Form1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(687, 529);
+ this.Controls.Add(this.splitContainer1);
+ this.Controls.Add(this.statusStrip1);
+ this.Controls.Add(this.menuStrip1);
+ this.MainMenuStrip = this.menuStrip1;
+ this.Name = "Form1";
+ this.Text = "Storm.NET";
+ this.statusStrip1.ResumeLayout(false);
+ this.statusStrip1.PerformLayout();
+ this.menuStrip1.ResumeLayout(false);
+ this.menuStrip1.PerformLayout();
+ this.splitContainer1.Panel1.ResumeLayout(false);
+ this.splitContainer1.Panel2.ResumeLayout(false);
+ this.splitContainer1.ResumeLayout(false);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.StatusStrip statusStrip1;
+ private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
+ private System.Windows.Forms.MenuStrip menuStrip1;
+ private System.Windows.Forms.ToolStripMenuItem stormToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem startToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem quitToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem aboutStormNETToolStripMenuItem;
+ private System.Windows.Forms.SplitContainer splitContainer1;
+ private System.Windows.Forms.TreeView treeView1;
+ private System.Windows.Forms.RichTextBox richTextBox1;
+
+ }
+}
+
Added: trunk/chaos.net/Storm.NET/Storm/Form1.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Form1.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Form1.cs 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Storm
+{
+ public partial class Form1 : Form
+ {
+ public Form1()
+ {
+ InitializeComponent();
+ }
+
+ }
+}
\ No newline at end of file
Added: trunk/chaos.net/Storm.NET/Storm/Form1.resx
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Form1.resx (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Form1.resx 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>127, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
Added: trunk/chaos.net/Storm.NET/Storm/Program.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Program.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Program.cs 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace Storm
+{
+ static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new Form1());
+ }
+ }
+}
\ No newline at end of file
Added: trunk/chaos.net/Storm.NET/Storm/Properties/AssemblyInfo.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Properties/AssemblyInfo.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Properties/AssemblyInfo.cs 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Storm")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Storm")]
+[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("941c35fd-a383-4dd9-9fab-86edd614fe3a")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Added: trunk/chaos.net/Storm.NET/Storm/Properties/Resources.Designer.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Properties/Resources.Designer.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Properties/Resources.Designer.cs 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.42
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Storm.Properties
+{
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources
+ {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources()
+ {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager
+ {
+ get
+ {
+ if ((resourceMan == null))
+ {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Storm.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture
+ {
+ get
+ {
+ return resourceCulture;
+ }
+ set
+ {
+ resourceCulture = value;
+ }
+ }
+ }
+}
Added: trunk/chaos.net/Storm.NET/Storm/Properties/Resources.resx
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Properties/Resources.resx (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Properties/Resources.resx 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: trunk/chaos.net/Storm.NET/Storm/Properties/Settings.Designer.cs
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Properties/Settings.Designer.cs (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Properties/Settings.Designer.cs 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.42
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Storm.Properties
+{
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+ {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default
+ {
+ get
+ {
+ return defaultInstance;
+ }
+ }
+ }
+}
Added: trunk/chaos.net/Storm.NET/Storm/Properties/Settings.settings
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Properties/Settings.settings (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Properties/Settings.settings 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+ <Profiles>
+ <Profile Name="(Default)" />
+ </Profiles>
+ <Settings />
+</SettingsFile>
Added: trunk/chaos.net/Storm.NET/Storm/Storm.csproj
===================================================================
--- trunk/chaos.net/Storm.NET/Storm/Storm.csproj (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm/Storm.csproj 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,78 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}</ProjectGuid>
+ <OutputType>WinExe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Storm</RootNamespace>
+ <AssemblyName>Storm</AssemblyName>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Deployment" />
+ <Reference Include="System.Drawing" />
+ <Reference Include="System.Windows.Forms" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Form1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Form1.Designer.cs">
+ <DependentUpon>Form1.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Program.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <EmbeddedResource Include="Form1.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>Form1.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ <None Include="Properties\Settings.settings">
+ <Generator>SettingsSingleFileGenerator</Generator>
+ <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+ </None>
+ <Compile Include="Properties\Settings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Settings.settings</DependentUpon>
+ <DesignTimeSharedInput>True</DesignTimeSharedInput>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file
Added: trunk/chaos.net/Storm.NET/Storm.sln
===================================================================
--- trunk/chaos.net/Storm.NET/Storm.sln (rev 0)
+++ trunk/chaos.net/Storm.NET/Storm.sln 2007-03-15 13:12:07 UTC (rev 1232)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C# Express 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storm", "Storm\Storm.csproj", "{6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6F1CEB73-BDC1-490E-A3F2-3A52F5566AA3}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Added: trunk/chaos.net/Storm.NET/Storm.suo
===================================================================
(Binary files differ)
Property changes on: trunk/chaos.net/Storm.NET/Storm.suo
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-15 13:07:36
|
Revision: 1231
http://chaos.svn.sourceforge.net/chaos/?rev=1231&view=rev
Author: perlundberg
Date: 2007-03-15 06:07:34 -0700 (Thu, 15 Mar 2007)
Log Message:
-----------
Created in SVN.
Added Paths:
-----------
trunk/chaos.net/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-14 21:40:57
|
Revision: 1230
http://chaos.svn.sourceforge.net/chaos/?rev=1230&view=rev
Author: perlundberg
Date: 2007-03-14 14:40:51 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
I played around a bit more and the bug turned out to be in the handling of 'micro packets'. :) Less than 60 bytes in size. These need to be zero-padded up to 60 bytes, because this is the minimum size of an ethernet frame. Now, I can ping the chaos host successfully. GLORY\!
Modified Paths:
--------------
trunk/chaos-old/servers/network/ne2000/ne2000.c
Modified: trunk/chaos-old/servers/network/ne2000/ne2000.c
===================================================================
--- trunk/chaos-old/servers/network/ne2000/ne2000.c 2007-03-14 21:14:20 UTC (rev 1229)
+++ trunk/chaos-old/servers/network/ne2000/ne2000.c 2007-03-14 21:40:51 UTC (rev 1230)
@@ -434,12 +434,16 @@
int nic_base = device->io;
time_type dma_start;
- int destination = 64 << 8;
+ int start_page = 64;
#ifdef NE_SANITY_CHECK
int retries = 0;
#endif
+ u8 scratch[60];
log_print(&log_structure, LOG_URGENCY_DEBUG, "in ne2000_start_transmit");
+
+ /* Turn off interrupts. */
+ outb_p(0x00, nic_base + NE_R0_IMR);
/* Round the count up for word writes. Do we need to do this?
What effect will an odd byte count have on the 8390?
@@ -456,6 +460,10 @@
"DMAing conflict in ne_block_output."
"[DMAstat:%d][irqlock:%d]\n",
device->status & NIC_DMA, device->status & NIC_INT);
+
+ /* Turn 8390 interrupts back on. */
+ outb_p(BIT_ISR_ALL, nic_base + NE_R0_IMR);
+
return FALSE;
}
@@ -483,13 +491,23 @@
#endif
outb_p(BIT_ISR_RDC, nic_base + NE_R0_ISR);
-
+
+ /* The minimum length of a frame that can be successfully sent is 60
+ bytes, minus FCS. */
+
+ if (length < 60) {
+ memory_copy(&scratch, data, length); // what if it has been word-aligned...?
+ memory_set_u8(&scratch[length], 0, 60 - length);
+ data = &scratch;
+ length = 60;
+ }
+
/* Now the normal output. */
outb_p(length & 0xFF, nic_base + NE_R0_RBCR0);
outb_p(length >> 8, nic_base + NE_R0_RBCR1);
- outb_p(destination & 0xFF, nic_base + NE_R0_RSAR0);
- outb_p(destination >> 8, nic_base + NE_R0_RSAR1);
+ outb_p(0, nic_base + NE_R0_RSAR0);
+ outb_p(start_page, nic_base + NE_R0_RSAR1);
outb_p(NE_RWRITE + NE_START, nic_base + NE_R0_CMD);
log_print_formatted(&log_structure, LOG_URGENCY_INFORMATIVE,
@@ -510,7 +528,7 @@
int high = inb_p(nic_base + NE_R0_RSAR1);
int low = inb_p(nic_base + NE_R0_RSAR0);
addr = (high << 8) + low;
- if (destination + length == addr) {
+ if ((start_page << 8) + length == addr) {
break;
}
} while (--tries > 0);
@@ -519,7 +537,7 @@
{
log_print_formatted(&log_structure, LOG_URGENCY_WARNING, "Tx packet transfer address mismatch,"
"%#4.4lx (expected) vs. %#4.4x (actual).\n",
- destination + length, addr);
+ (start_page << 8) + length, addr);
if (retries++ == 0)
goto retry;
}
@@ -534,6 +552,10 @@
log_print(&log_structure, LOG_URGENCY_WARNING, "timeout waiting for Tx RDC.");
ne_reset_chip(device);
ne_init_chip(device, 1);
+
+ /* Turn 8390 interrupts back on. */
+ outb_p(BIT_ISR_ALL, nic_base + NE_R0_IMR);
+
return FALSE;
}
@@ -546,14 +568,21 @@
if (inb_p(nic_base) & NE_TRANS)
{
log_print(&log_structure, LOG_URGENCY_WARNING, "ne2000_start_transmit() called with the transmitter busy");
+
+ /* Turn 8390 interrupts back on. */
+ outb_p(BIT_ISR_ALL, nic_base + NE_R0_IMR);
+
return FALSE;
}
outb_p(length & 0xFF, nic_base + NE_R0_TBCR0);
outb_p(length >> 8, nic_base + NE_R0_TBCR1);
- outb_p(destination >> 8, nic_base + NE_R0_TPSR);
+ outb_p(start_page, nic_base + NE_R0_TPSR);
outb_p(NE_NODMA + NE_TRANS + NE_START, nic_base + NE_R0_CMD);
+ /* Turn 8390 interrupts back on. */
+ outb_p(BIT_ISR_ALL, nic_base + NE_R0_IMR);
+
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-14 21:14:26
|
Revision: 1229
http://chaos.svn.sourceforge.net/chaos/?rev=1229&view=rev
Author: perlundberg
Date: 2007-03-14 14:14:20 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
Transmitting now ALMOST works as well. ;) The ARP reply from ipv4 comes through almost properly to my Linux box, but with the remark 'oui Unknown'. I have no clue what that means but probably, something with the packet is not 100% correct. It seems bigger in my tcpdump than what it should be. Also, the ne2000 server stops working whenever the first packet has been sent, so obviously, I seem to be doing something wrong. :-)
Modified Paths:
--------------
trunk/chaos-old/servers/network/ne2000/autochaos.rules
trunk/chaos-old/servers/network/ne2000/config.h
trunk/chaos-old/servers/network/ne2000/configure
trunk/chaos-old/servers/network/ne2000/ne2000.c
trunk/chaos-old/servers/network/ne2000/ne2000.h
Modified: trunk/chaos-old/servers/network/ne2000/autochaos.rules
===================================================================
--- trunk/chaos-old/servers/network/ne2000/autochaos.rules 2007-03-13 23:03:05 UTC (rev 1228)
+++ trunk/chaos-old/servers/network/ne2000/autochaos.rules 2007-03-14 21:14:20 UTC (rev 1229)
@@ -10,6 +10,7 @@
<library type="depend">system</library>
<library type="depend">memory</library>
<library type="depend">ipv4</library>
+ <library type="depend">time</library>
<makefile>makefile</makefile>
<source>ne2000.c</source>
</package>
Modified: trunk/chaos-old/servers/network/ne2000/config.h
===================================================================
--- trunk/chaos-old/servers/network/ne2000/config.h 2007-03-13 23:03:05 UTC (rev 1228)
+++ trunk/chaos-old/servers/network/ne2000/config.h 2007-03-14 21:14:20 UTC (rev 1229)
@@ -13,5 +13,6 @@
#include <system/system.h>
#include <memory/memory.h>
#include <ipv4/ipv4.h>
+#include <time/time.h>
#endif /* !__CONFIG_H__ */
Modified: trunk/chaos-old/servers/network/ne2000/configure
===================================================================
--- trunk/chaos-old/servers/network/ne2000/configure 2007-03-13 23:03:05 UTC (rev 1228)
+++ trunk/chaos-old/servers/network/ne2000/configure 2007-03-14 21:14:20 UTC (rev 1229)
@@ -169,7 +169,21 @@
exit 1;
}
+print ("Checking for time library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_time.a")
+{
+ print ("found.\n");
+ push (@libraries, "time");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: time is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+
my $all_arguments = "";
foreach my $argument (@ARGV)
{
Modified: trunk/chaos-old/servers/network/ne2000/ne2000.c
===================================================================
--- trunk/chaos-old/servers/network/ne2000/ne2000.c 2007-03-13 23:03:05 UTC (rev 1228)
+++ trunk/chaos-old/servers/network/ne2000/ne2000.c 2007-03-14 21:14:20 UTC (rev 1229)
@@ -40,7 +40,7 @@
void ne_init_chip(device_type *, u8);
void ne_int_handler(device_type *);
void ne_recv(device_type *);
-void ne_xmit(device_type *);
+bool ne2000_start_transmit (void *data, u32 length, device_type *device);
void ne_download_buf(device_type *, u16, u8 *, u16);
void ne_handle_overflow(device_type *);
u16 hex2dec(u8 *);
@@ -191,7 +191,7 @@
#endif
}
- if (sreg & (BIT_ISR_RX+BIT_ISR_RX_ERR))
+ if (sreg & (BIT_ISR_RX + BIT_ISR_RX_ERR))
{
if (debug >= 2)
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Packet received");
@@ -241,45 +241,51 @@
outb (NE_NODMA + NE_PAGE0 + NE_START, card->io);
}
- if (num_handled == MAX_INT_WORK)
- if (debug >= 1)
+ if (num_handled == MAX_INT_WORK) {
+ if (debug >= 1) {
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- ** -- Max interrupt work done!!");
+ }
+ }
card->status &= ~NIC_INT;
- if (debug >= 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ISR:%2.2x ISM:%2.2x device_type status:%.2x (Leaving interrupt handler)", inb(card->io+NE_R0_ISR),
- inb (card->io+NE_R0_IMR), card->status);
+ if (debug >= 2) {
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ISR:%2.2x ISM:%2.2x device_type status:%.2x (Leaving interrupt handler)", inb(card->io + NE_R0_ISR),
+ inb (card->io + NE_R0_IMR), card->status);
+ }
}
void ne_recv (device_type *card)
{
/* xxx - moved data_buffer to global .. */
- u8 *data = ((u8 *) data_buffer) + ((u8) 8);
- u8 rx_packets = 0;
- u8 rx_page;
- u8 frame, next_frame, pkt_status;
- u16 current_offset, pkt_len;
- struct ne_pkt_hdr pkt_hdr;
+ u8 *data = ((u8 *) data_buffer) + ((u8) 8);
+ u8 rx_packets = 0;
+ u8 rx_page;
+ u8 frame, next_frame, pkt_status;
+ u16 current_offset, pkt_len;
+ struct ne_pkt_hdr pkt_hdr;
+ int n;
frame = 0;
current_offset = 0;
for (rx_packets = 0;rx_packets < 10;rx_packets++)
{
/* Switch to page 1 */
- outb (NE_NODMA+NE_PAGE1, card->io);
+ outb (NE_NODMA + NE_PAGE1, card->io);
/* Get the packet ptr from current page */
- rx_page = inb (card->io+NE_PG_CURRENT);
+ rx_page = inb (card->io + NE_PG_CURRENT);
/* Switch back to page 0 */
- outb (NE_NODMA+NE_PAGE0, card->io);
+ outb (NE_NODMA + NE_PAGE0, card->io);
- frame = inb (card->io+NE_BOUNDARY) + 1;
+ frame = inb (card->io + NE_BOUNDARY) + 1;
if (frame >= NE_PG_STOP)
{
- if (debug >= 2)
+ if (debug >= 2) {
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- hmm? weirdo. fixing frame: %x => %x", frame, NE_PG_RX_START);
+ }
+
frame = NE_PG_RX_START;
}
@@ -373,73 +379,33 @@
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Download done!");
- { /* XXX - This code doesn't belong here, heh. */
- struct ethhdr *e;
- struct iphdr *i;
- struct tcphdr *t;
- u8 *p = data;
- u8 n;
-
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** proto is [%.4x] ==> %s", PROTO,
- PROTO == 0x800? "IP/ETH":
- PROTO == 0x806? "ARP/ETH": "unknown");
-
- e = (struct ethhdr *) p;
- p += sizeof(struct ethhdr);
- i = (struct iphdr *) p;
- p += sizeof(struct iphdr);
- t = (struct tcphdr *) p;
-
- if (host_to_network_u16 (e->h_proto) == 0x800)
+ /* Check if this packet should be delivered somewhere. */
+
+ for (n = 0; n < card->number_of_targets; n++)
+ {
+ if (card->target[n].protocol_type ==
+ ((ipv4_ethernet_header_type *) data)->protocol_type)
{
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG,
- "** IP: ver:0x%x prot:0x%x len:0x%x",
- i->version, i->protocol,
- host_to_network_u16(i->tot_len)-sizeof(struct ethhdr)-sizeof(struct iphdr));
- p = (u8 *)&i->saddr;
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG,
- "++ %s/IP Packet received [%u.%u.%u.%u ==> %u.%u.%u.%u]",
- i->protocol == 0x11? "UDP": i->protocol == 0x6? "TCP":
- i->protocol == 0x1? "ICMP": "Unknown",
- p[0], p[1], p[2], p[3],
- p[4], p[5], p[6], p[7]);
-
- if (i->protocol == 0x1)
+ message_parameter_type message_parameter;
+
+ message_parameter.protocol = IPC_PROTOCOL_ETHERNET;
+ message_parameter.message_class = IPC_ETHERNET_PACKET_RECEIVED;
+ message_parameter.length = pkt_len + 8; /* probably 8 bytes of header. */
+ message_parameter.block = FALSE;
+ message_parameter.data = data;
+
+ if (debug >= 1)
{
- p += sizeof (ipv4_ethernet_header_type);
- log_print_formatted(&log_structure, LOG_URGENCY_DEBUG, "ICMP type is [%.2x : %.2x]", p[0], p[1]);
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG,
+ "Sending to mailbox ID %u",
+ card->target[n].mailbox_id);
}
-
+
+ system_call_mailbox_send (card->target[n].mailbox_id,
+ &message_parameter);
+ break;
}
-
- /* Check if this packet should be delivered somewhere. */
-
- for (n = 0; n < card->number_of_targets; n++)
- {
- if (card->target[n].protocol_type ==
- ((ipv4_ethernet_header_type *) data)->protocol_type)
- {
- message_parameter_type message_parameter;
-
- message_parameter.protocol = IPC_PROTOCOL_ETHERNET;
- message_parameter.message_class = IPC_ETHERNET_PACKET_RECEIVED;
- message_parameter.length = pkt_len + 8; /* probably 8 bytes of header. */
- message_parameter.block = FALSE;
- message_parameter.data = data;
-
- if (debug >= 1)
- {
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG,
- "Sending to mailbox ID %u",
- card->target[n].mailbox_id);
- }
-
- system_call_mailbox_send (card->target[n].mailbox_id,
- &message_parameter);
- break;
- }
- }
- } /* End of IP code */
+ }
} /* End of RX ok code */
else
{
@@ -447,11 +413,13 @@
card->num_dropped++;
}
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x => %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x]",
- data[6], data[7], data[8],
- data[9], data[10], data[11],
- data[0], data[1], data[2],
- data[3], data[4], data[5]);
+ if (debug >= 2) {
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x => %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x]",
+ data[6], data[7], data[8],
+ data[9], data[10], data[11],
+ data[0], data[1], data[2],
+ data[3], data[4], data[5]);
+ }
next_frame = pkt_hdr.next;
outb (next_frame-1, card->io+NE_BOUNDARY);
@@ -460,32 +428,136 @@
outb (BIT_ISR_RX + BIT_ISR_RX_ERR, card->io + NE_R0_ISR);
}
-void ne_xmit (device_type *card)
+#define NE_SANITY_CHECK
+bool ne2000_start_transmit (void *data, u32 length, device_type *device)
{
- u8 status;
+ int nic_base = device->io;
+ time_type dma_start;
- status = inb (card->io + NE_R0_TSR);
- if (debug >= 1)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** TSR status is 0x%x", status);
+ int destination = 64 << 8;
+#ifdef NE_SANITY_CHECK
+ int retries = 0;
+#endif
- /* Acknowledge interrupt */
- outb (BIT_ISR_TX, card->io+NE_R0_ISR);
+ log_print(&log_structure, LOG_URGENCY_DEBUG, "in ne2000_start_transmit");
+
+ /* Round the count up for word writes. Do we need to do this?
+ What effect will an odd byte count have on the 8390?
+ I should check someday. */
+
+ if (length & 0x01) {
+ length++;
+ }
+
+ /* This *shouldn't* happen. If it does, it's the last thing you'll see */
+ if ((device->status & NIC_DMA) == NIC_DMA)
+ {
+ log_print_formatted(&log_structure, LOG_URGENCY_EMERGENCY,
+ "DMAing conflict in ne_block_output."
+ "[DMAstat:%d][irqlock:%d]\n",
+ device->status & NIC_DMA, device->status & NIC_INT);
+ return FALSE;
+ }
+ device->status |= NIC_DMA;
+ /* We should already be in page 0, but to be safe... */
+ outb_p(NE_PAGE0 + NE_START + NE_NODMA, nic_base + NE_R0_CMD);
+
+#ifdef NE_SANITY_CHECK
+retry:
+#endif
+
+#ifdef NE8390_RW_BUGFIX
+ /* Handle the read-before-write bug the same way as the
+ Crynwr packet driver -- the NatSemi method doesn't work.
+ Actually this doesn't always work either, but if you have
+ problems with your NEx000 this is better than nothing! */
+
+ outb_p(0x42, nic_base + NE_R0_RCNT0);
+ outb_p(0x00, nic_base + NE_R0_RCNT1);
+ outb_p(0x42, nic_base + NE_R0_RSAR0);
+ outb_p(0x00, nic_base + NE_R0_RSAR1);
+ outb_p(E8390_RREAD + E8390_START, nic_base + NE_R0_CMD);
+ /* Make certain that the dummy read has occurred. */
+ system_sleep(1);
+#endif
+
+ outb_p(BIT_ISR_RDC, nic_base + NE_R0_ISR);
+
+ /* Now the normal output. */
+ outb_p(length & 0xFF, nic_base + NE_R0_RBCR0);
+ outb_p(length >> 8, nic_base + NE_R0_RBCR1);
+
+ outb_p(destination & 0xFF, nic_base + NE_R0_RSAR0);
+ outb_p(destination >> 8, nic_base + NE_R0_RSAR1);
+
+ outb_p(NE_RWRITE + NE_START, nic_base + NE_R0_CMD);
+ log_print_formatted(&log_structure, LOG_URGENCY_INFORMATIVE,
+ "Sending %ld bytes...", length);
+ outsw(nic_base + NE_DATAPORT, data, length >> 1);
+
+ dma_start = time_get ();
+
+#ifdef NE_SANITY_CHECK
+ /* This was for the ALPHA version only, but enough people have
+ been encountering problems so it is still here. */
+
+ if (debug > 1)
+ {
+ /* DMA termination address check... */
+ unsigned int addr, tries = 20;
+ do {
+ int high = inb_p(nic_base + NE_R0_RSAR1);
+ int low = inb_p(nic_base + NE_R0_RSAR0);
+ addr = (high << 8) + low;
+ if (destination + length == addr) {
+ break;
+ }
+ } while (--tries > 0);
+
+ if (tries <= 0)
+ {
+ log_print_formatted(&log_structure, LOG_URGENCY_WARNING, "Tx packet transfer address mismatch,"
+ "%#4.4lx (expected) vs. %#4.4x (actual).\n",
+ destination + length, addr);
+ if (retries++ == 0)
+ goto retry;
+ }
+ }
+#endif
+
+ while ((inb_p(nic_base + NE_R0_ISR) & BIT_ISR_RDC) == 0)
+ /* Wait for up to 1 second. This is obviously far too long, the
+ Linux code uses 20ms but this is much easier to
+ implement. :-) */
+ if (time_get () - dma_start > 0) {
+ log_print(&log_structure, LOG_URGENCY_WARNING, "timeout waiting for Tx RDC.");
+ ne_reset_chip(device);
+ ne_init_chip(device, 1);
+ return FALSE;
+ }
+
+ outb_p(BIT_ISR_RDC, nic_base + NE_R0_ISR); /* Ack intr. */
+ device->status &= ~NIC_DMA;
+ /* Okay, let's send this frame. */
+ outb_p(NE_NODMA + NE_PAGE0, nic_base + NE_R0_CMD);
- /* XXX - hehe... */
+ if (inb_p(nic_base) & NE_TRANS)
+ {
+ log_print(&log_structure, LOG_URGENCY_WARNING, "ne2000_start_transmit() called with the transmitter busy");
+ return FALSE;
+ }
+ outb_p(length & 0xFF, nic_base + NE_R0_TBCR0);
+ outb_p(length >> 8, nic_base + NE_R0_TBCR1);
+ outb_p(destination >> 8, nic_base + NE_R0_TPSR);
+ outb_p(NE_NODMA + NE_TRANS + NE_START, nic_base + NE_R0_CMD);
-
-
+ return TRUE;
}
-
-
-
-
-
void ne_download_buf (device_type *n, u16 len, u8 *data, u16 offset)
{
if (debug >= 2)
@@ -497,7 +569,7 @@
outb (len >> 8, n->io + NE_R0_RBCR1);
outb (offset & 0xFF, n->io + NE_R0_RSAR0);
outb (offset >> 8, n->io + NE_R0_RSAR1);
- outb (NE_RREAD+NE_START, n->io);
+ outb (NE_RREAD + NE_START, n->io);
if (debug >= 2)
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ne_download_buf(): now we're about to read..");
@@ -676,13 +748,13 @@
/* Init registers and shit */
- for (i = 0;i < sizeof (ne_preinit_program)/sizeof (ne_program);i++)
+ for (i = 0; i < sizeof (ne_preinit_program)/ sizeof (ne_program); i++)
{
outb (ne_preinit_program[i].value, device->io + ne_preinit_program[i].offset);
}
/* It's time to read the station address prom now */
- for (i = 0, x = 0;i < 32;i += 2)
+ for (i = 0, x = 0; i < 32; i += 2)
{
device->prom[i] = inb (device->io + NE_DATAPORT);
device->prom[i+1] = inb (device->io + NE_DATAPORT);
@@ -767,20 +839,20 @@
break;
}
-#if FALSE
case IPC_ETHERNET_PACKET_SEND:
{
- if (!etherlink3_start_transmit (data, message_parameter.length, device))
+ if (!ne2000_start_transmit (data, message_parameter.length, device))
{
log_print (&log_structure, LOG_URGENCY_ERROR,
"Failed to send an ethernet packet.");
- /* FIXME: Do something. */
+ /* FIXME: Do something useful. We should probably send an
+ IPC message back to the sender regardless, to notify that
+ the package was sent/not sent. */
}
break;
}
-#endif
case IPC_ETHERNET_ADDRESS_GET:
{
@@ -895,6 +967,7 @@
return 0;
}
+/* Can probably be removed soon... */
#if 0
int main(int argc, char *argv[])
{
Modified: trunk/chaos-old/servers/network/ne2000/ne2000.h
===================================================================
--- trunk/chaos-old/servers/network/ne2000/ne2000.h 2007-03-13 23:03:05 UTC (rev 1228)
+++ trunk/chaos-old/servers/network/ne2000/ne2000.h 2007-03-14 21:14:20 UTC (rev 1229)
@@ -19,7 +19,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA. */
-const int debug = 1;
+// FIXME: this should be a define, not a variable. That way we will
+// not even compile in debugging code if not debugging = greater
+// performance.
+const int debug = 0;
/* 0: no debug at all
1: normal debug
@@ -127,11 +130,19 @@
/* To avoid rewriting a lot of code... */
#define outb(a,b) system_port_out_u8 (b, a)
#define inb(a) system_port_in_u8 (a)
+#define outb_p(a,b) system_port_out_u8_pause (b,a)
+static inline u8 inb_p(u16 a) {
+ u8 value = system_port_in_u8 (a);
+ system_sleep (1);
+ return value;
+}
+
+#define outsw(a,b,c) system_port_out_u16_string(a,b,c)
+
/* FIXME: this should be placed in the ipv4 library or similar. */
#define host_to_network_u16(a) system_byte_swap_u16(a)
-
/* Message stuff */
#define NE_START_CARD 0x02
#define NE_STOP_CARD 0x04
@@ -186,9 +197,9 @@
#define NE_R0_TSR 0x04 /* Transmit status register [read] */
#define NE_R0_TPSR 0x04 /* Transmit page start address [write] */
#define NE_R0_NCR 0x05 /* Number of collision register [read] */
-#define NE_R0_TBCR0 0x06 /* Transmit byte count register 0 [write] */
-#define NE_R0_TBCR1 0x07 /* Transmit byte count register 1 [write] */
-#define NE_R0_FIFO 0x06 /* Fifo [read] */
+#define NE_R0_TBCR0 0x05 /* Transmit byte count register 0 [write] */
+#define NE_R0_FIFO 0x06 /* FIFO [read] */
+#define NE_R0_TBCR1 0x06 /* Transmit byte count register 1 [write] */
#define NE_R0_ISR 0x07 /* Interrupt status register [read/write] */
#define NE_R0_CRDA0 0x08 /* Current remote DMA address register 0 [read] */
#define NE_R0_RSAR0 0x08 /* Remote start address register 0 [write] */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-13 23:03:08
|
Revision: 1228
http://chaos.svn.sourceforge.net/chaos/?rev=1228&view=rev
Author: perlundberg
Date: 2007-03-13 16:03:05 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
Worked more on the ne2000 server. Receiving seems to work now and the packets are forwarded to the ipv4 server but the ICMP ECHO message (a.k.a. ping) I am sending seems to be garbled somehow. The ipv4 server detects and acknowledges arp who-has packets being sent on the network though, so kind of a weird bug.
Modified Paths:
--------------
trunk/chaos-old/servers/network/ne2000/ne2000.c
trunk/chaos-old/servers/network/ne2000/ne2000.h
Modified: trunk/chaos-old/servers/network/ne2000/ne2000.c
===================================================================
--- trunk/chaos-old/servers/network/ne2000/ne2000.c 2007-03-12 20:30:09 UTC (rev 1227)
+++ trunk/chaos-old/servers/network/ne2000/ne2000.c 2007-03-13 23:03:05 UTC (rev 1228)
@@ -36,7 +36,6 @@
log_structure_type log_structure;
-u8 ne_detect(device_type *);
u8 ne_reset_chip(device_type *);
void ne_init_chip(device_type *, u8);
void ne_int_handler(device_type *);
@@ -48,117 +47,11 @@
//device_type card;
u32 message[1024];
-u32 data_buffer[1024]; /* xxx - was 400 before.. */
+u32 data_buffer[1518]; /* xxx - was 400 before.. */
struct ne_user_t users[MAX_USERS];
u8 num_users = 0;
-u8 ne_detect (device_type *n)
-{
- u8 chk = 0, x;
- u32 i;
-
- if (!n || !n->io || !n->irq)
- {
- log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "-- Invalid io(0x%x) address or irq(%d)", n->io, n->irq);
- return ERROR;
- }
-
- if (system_call_port_range_register (n->io, 0x1F, PACKAGE_NAME))
- {
- log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "-- Cannot allocate 0x%x => 0x%x", n->io, n->io+0x1f);
- return ERROR;
- }
-
- chk = system_port_in_u8 (n->io);
- if (chk == 0xff) /* No card found */
- {
- log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "-- Nothing found on 0x%x", n->io);
-
- /* FIXME: deallocate I/O space */
- return ERROR;
- }
-
- /* Check if it really is a NE2k card */
- outb (NE_NODMA + NE_PAGE1 + NE_STOP, n->io); /* Stop the card */
- x = inb (n->io + NE_R0_CNTR0);
- outb (0xff, n->io + NE_R0_CNTR0);
- outb (NE_NODMA + NE_PAGE0, n->io);
- inb (n->io + NE_R0_CNTR0); /* Clear the counter by reading */
-
- if (inb (n->io + NE_R0_CNTR0) != 0) /* Ooops ;) */
- {
- outb (chk, n->io);
- outb (chk, n->io + NE_R0_CNTR0);
- log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "Something, but not a NE2k card, found. Aborting");
- return ERROR;
- }
-
- ne_reset_chip (n);
-
- /* We don't ack _all_ interrupts in ne_reset_chip(),
- so we do it here instead */
- outb (0xff, n->io + NE_R0_ISR);
-
-
- /* Init registers and shit */
- for (i = 0;i < sizeof (ne_preinit_program)/sizeof (ne_program);i++)
- {
- outb (ne_preinit_program[i].value, n->io + ne_preinit_program[i].offset);
- }
-
- /* It's time to read the station address prom now */
- for (i = 0, x = 0;i < 32;i += 2)
- {
- n->prom[i] = inb (n->io + NE_DATAPORT);
- n->prom[i+1] = inb (n->io + NE_DATAPORT);
- if (n->prom[i] != n->prom[i+1])
- x = 1;
- }
-
- if (x) /* This isn't a 16 bit card */
- {
- log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "Haha! Your card isn't supported. Get a 16 bit card");
- return ERROR;
- }
-
- for (i = 0;i < 16;i++)
- n->prom[i] = n->prom[i+i];
-
- for (i = 0; i < 6; i++)
- n->ethernet_address[i] = n->prom[i];
-
- log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "MAC address is %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x"
- " and signature [0x%x 0x%x]",
- n->prom[0], n->prom[1], n->prom[2],
- n->prom[3], n->prom[4], n->prom[5],
- n->prom[14], n->prom[15]);
-
- outb (0x49, n->io + NE_R0_DCR); /* Set the card in word-wide mode */
-
- /* Create a thread for the IRQ handler and set up an IRQ handler loop. */
- if (system_call_thread_create () == SYSTEM_RETURN_THREAD_NEW) {
- if (system_call_irq_register (n->irq, PACKAGE_NAME) != SYSTEM_RETURN_SUCCESS)
- {
- log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "$@!# Couldn't register irq %d :(", n->irq);
- /* FIXME: Deallocate I/O space. */
-
- return ERROR;
- }
-
- while (TRUE) {
- system_call_irq_wait (n->irq);
- ne_int_handler (n);
- }
- }
-
- /* this code should probably wait here until the IRQ handler etc has
- been setup... */
-
- ne_init_chip (n, 0);
- return 0;
-}
-
u8 ne_reset_chip (device_type *n)
{
u16 i;
@@ -234,144 +127,134 @@
outb (NE_DEF_RXCFG, n->io + NE_R0_RCR); /* ..and receive. */
n->status |= NIC_UP;
}
- else
+ else {
n->status |= NIC_DOWN;
+ }
-
n->status &= ~NIC_INIT;
}
/* FIXME: rewrite this! */
void ne_int_handler (device_type *card __attribute__ ((unused)))
{
- return;
-
-#if 0
int sreg;
u8 num_handled;
- for (card->num_interrupts = 1;; card->num_interrupts++)
+ card->num_interrupts++;
+
+ if (debug >= 2)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Entering interrupt again");
+
+ if (card->status & NIC_INT)
+ log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- What, entering interrupt again???");
+
+ card->status |= NIC_INT;
+
+ /* Switch to page 0 */
+ outb (NE_NODMA + NE_PAGE0, card->io);
+
+ num_handled = 0;
+ while (!(card->status & NIC_BUSY) &&
+ (sreg = inb (card->io + NE_R0_ISR)) != 0 &&
+ num_handled++ < MAX_INT_WORK)
{
- if (debug >= 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Entering interrupt again");
-
- if (card->status & NIC_INT)
- log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- What, entering interrupt again???");
-
- card->status |= NIC_INT;
-
- /* Switch to page 0 */
- outb (NE_NODMA + NE_PAGE0, card->io);
-
- num_handled = 0;
- while (!(card->status & NIC_BUSY) &&
- (sreg = inb (card->io + NE_R0_ISR)) != 0 &&
- num_handled++ < MAX_INT_WORK)
+ // sreg = inb (card->io+NE_R0_ISR);
+ if (debug == 2)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ISR:%2.2x ISM:%2.2x", sreg, inb(card->io + NE_R0_IMR));
+
+ if (!(card->status & NIC_UP))
+ log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- Weird, this nic should be stopped!");
+
+ if (sreg & BIT_ISR_OVERFLW)
{
-// sreg = inb (card->io+NE_R0_ISR);
- if (debug == 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ISR:%2.2x ISM:%2.2x", sreg, inb(card->io + NE_R0_IMR));
-
- if (!(card->status & NIC_UP))
- log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- Weird, this nic should be stopped!");
-
- if (sreg & BIT_ISR_OVERFLW)
- {
- if (debug >= 1)
- log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- Overflow in rx buffer");
-
- /* This a little more than 10ms. */
+ if (debug >= 1)
+ log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- Overflow in rx buffer");
+
+ /* This a little more than 10ms. */
#ifdef CAN_WAIT_10_MS
- ne_handle_overflow (card);
-
+ ne_handle_overflow (card);
+
#else /* XXX - this code probably DONT work */
#error "Tomtevarning; DEN H\xC4R KODEN FUNKAR INTE"
- {
- u32 tomte;
-
- if (debug >= 1)
- log_print_formatted ("** resetting card->.");
-
- tomte = NE_RST_OVERRUN;
- card->status |= NIC_BUSY;
- syscall_message_send (syscall_process_get_pid_by_name ("ne"), &tomte, 4);
- break;
- /* Maybe we should ack. some interrupts.. */
- }
-#endif
- }
-
- if (sreg & (BIT_ISR_RX+BIT_ISR_RX_ERR))
{
- if (debug >= 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Packet received");
-
- ne_recv (card);
+ u32 tomte;
+
+ if (debug >= 1)
+ log_print_formatted ("** resetting card->.");
+
+ tomte = NE_RST_OVERRUN;
+ card->status |= NIC_BUSY;
+ syscall_message_send (syscall_process_get_pid_by_name ("ne"), &tomte, 4);
+ break;
+ /* Maybe we should ack. some interrupts.. */
}
+#endif
+ }
- if (sreg & BIT_ISR_TX)
- if (debug >= 1)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Transmit");
+ if (sreg & (BIT_ISR_RX+BIT_ISR_RX_ERR))
+ {
+ if (debug >= 2)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Packet received");
+
+ ne_recv (card);
+ }
- if (sreg & BIT_ISR_TX_ERR)
- if (debug >= 1)
- log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- Transmit error");
+ if (sreg & BIT_ISR_TX)
+ if (debug >= 1)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** Transmit");
+
+ if (sreg & BIT_ISR_TX_ERR)
+ if (debug >= 1)
+ log_print_formatted (&log_structure, LOG_URGENCY_WARNING, "-- Transmit error");
- if (sreg & BIT_ISR_CNTRS)
- {
- u8 x,y,z;
- x = inb (card->io+NE_R0_CNTR0);
- y = inb (card->io+NE_R0_CNTR1);
- z = inb (card->io+NE_R0_CNTR2);
- outb (BIT_ISR_CNTRS, card->io+NE_R0_ISR);
- if (debug >= 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- COUNTERS: frame:%d crc:%d missed:%d", x,y,z);
- }
+ if (sreg & BIT_ISR_CNTRS)
+ {
+ u8 x,y,z;
+ x = inb (card->io+NE_R0_CNTR0);
+ y = inb (card->io+NE_R0_CNTR1);
+ z = inb (card->io+NE_R0_CNTR2);
+ outb (BIT_ISR_CNTRS, card->io+NE_R0_ISR);
+ if (debug >= 2)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- COUNTERS: frame:%d crc:%d missed:%d", x,y,z);
+ }
- if (sreg & BIT_ISR_RDC)
- {
- if (debug >= 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- Ignoring RDC interrupt");
+ if (sreg & BIT_ISR_RDC)
+ {
+ if (debug >= 2)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- Ignoring RDC interrupt");
- outb (BIT_ISR_RDC, card->io + NE_R0_ISR);
+ outb (BIT_ISR_RDC, card->io + NE_R0_ISR);
- /* XXX - lock here for debugging purposes */
-// for(;;);
- }
+ /* XXX - lock here for debugging purposes */
+ // for(;;);
+ }
- /* XXX - varf\xF6r i helvete sitter det en // h\xE4r? */
- /* Ack. all interrupts */
-// outb (0xff, card->io + NE_R0_ISR);
+ /* XXX - varf\xF6r i helvete sitter det en // h\xE4r? */
+ /* Ack. all interrupts */
+ // outb (0xff, card->io + NE_R0_ISR);
- /* XXX - does this enable the card again?
- does it make the card generate intr.:s. again? */
+ /* XXX - does this enable the card again?
+ does it make the card generate intr.:s. again? */
- outb (NE_NODMA + NE_PAGE0 + NE_START, card->io);
- }
+ outb (NE_NODMA + NE_PAGE0 + NE_START, card->io);
+ }
- if (num_handled == MAX_INT_WORK)
- if (debug >= 1)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- ** -- Max interrupt work done!!");
+ if (num_handled == MAX_INT_WORK)
+ if (debug >= 1)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- ** -- Max interrupt work done!!");
- card->status &= ~NIC_INT;
- if (debug >= 2)
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ISR:%2.2x ISM:%2.2x device_type status:%.2x (Leaving interrupt handler)", inb(card->io+NE_R0_ISR),
- inb (card->io+NE_R0_IMR), card->status);
-
- // FIXME: should we acknowledge each interrupt if we have multiple
- // interrupts waiting in queue? Probably.
- system_call_irq_acknowledge (card->irq);
- }
-#endif
+ card->status &= ~NIC_INT;
+ if (debug >= 2)
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** ISR:%2.2x ISM:%2.2x device_type status:%.2x (Leaving interrupt handler)", inb(card->io+NE_R0_ISR),
+ inb (card->io+NE_R0_IMR), card->status);
}
-
void ne_recv (device_type *card)
{
-/* xxx - moved data_buffer to global .. */
- u8 *data = ((u8 *)data_buffer) + ((u8) 8);
+ /* xxx - moved data_buffer to global .. */
+ u8 *data = ((u8 *) data_buffer) + ((u8) 8);
u8 rx_packets = 0;
u8 rx_page;
u8 frame, next_frame, pkt_status;
@@ -407,7 +290,7 @@
if (frame == rx_page) /* D0h, we're done */
{
- if (debug >= 1)
+ if (debug >= 2)
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** wow, we're done recv!");
break;
@@ -479,7 +362,7 @@
/* Do something useful */
if ((pkt_status & 0x0f) == BIT_RSR_RXOK)
{
- /* Wheee.. We recv. a good packet */
+ /* Wheee.. We received a good packet */
#define PROTO ((data[12]*256)+data[13])
if (debug >= 1)
@@ -523,34 +406,38 @@
if (i->protocol == 0x1)
{
- p += sizeof (struct iphdr);
+ p += sizeof (ipv4_ethernet_header_type);
log_print_formatted(&log_structure, LOG_URGENCY_DEBUG, "ICMP type is [%.2x : %.2x]", p[0], p[1]);
}
}
-
- for (n = 0; n < num_users; n++)
- {
- if (users[n].proto != e->h_proto)
+
+ /* Check if this packet should be delivered somewhere. */
+
+ for (n = 0; n < card->number_of_targets; n++)
+ {
+ if (card->target[n].protocol_type ==
+ ((ipv4_ethernet_header_type *) data)->protocol_type)
{
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** User proto: %d eth: %d\n", users[n].proto, (e->h_proto));
- continue;
+ message_parameter_type message_parameter;
+
+ message_parameter.protocol = IPC_PROTOCOL_ETHERNET;
+ message_parameter.message_class = IPC_ETHERNET_PACKET_RECEIVED;
+ message_parameter.length = pkt_len + 8; /* probably 8 bytes of header. */
+ message_parameter.block = FALSE;
+ message_parameter.data = data;
+
+ if (debug >= 1)
+ {
+ log_print_formatted (&log_structure, LOG_URGENCY_DEBUG,
+ "Sending to mailbox ID %u",
+ card->target[n].mailbox_id);
+ }
+
+ system_call_mailbox_send (card->target[n].mailbox_id,
+ &message_parameter);
+ break;
}
-
- // Send the packet to the destination
-#if 0
- message_parameter_type message_parameter;
-
- message_parameter.protocol = IPC_PROTOCOL_ETHERNET;
- message_parameter.message_class = IPC_ETHERNET_PACKET_RECEIVED;
- message_parameter.length = pkt_len;
- message_parameter.block = FALSE;
- message_parameter.data = data_buffer;
-
- log_print_formatted(&log_structure, LOG_URGENCY_DEBUG, "Sending data to pid %ld: ETHERNET_PACKET_RECEIVED, len %d 0x%x\n", users[n].pid, pkt_len + 8, pkt_len + 8);
- system_call_mailbox_send (device->target[n].mailbox_id,
- &message_parameter);
-#endif
}
} /* End of IP code */
} /* End of RX ok code */
@@ -630,16 +517,16 @@
-void ne_handle_overflow (device_type *n)
+void ne_handle_overflow (device_type *device)
{
u8 txing, resend = 0;
u16 x;
- txing = inb (n->io) & NE_TRANS;
+ txing = inb (device->io) & NE_TRANS;
/* stop the card->. */
- outb (NE_NODMA + NE_PAGE0 + NE_STOP, n->io);
+ outb (NE_NODMA + NE_PAGE0 + NE_STOP, device->io);
if (debug >= 1)
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "-- Huh.. Overflow.. Sleeping one second!");
@@ -649,36 +536,36 @@
#endif
for(x = 1;x != 0;x++); /* XXX - Hmm, this is probably ok for now :) */
- outb (0, n->io + NE_R0_RBCR0);
- outb (0, n->io + NE_R0_RBCR1);
+ outb (0, device->io + NE_R0_RBCR0);
+ outb (0, device->io + NE_R0_RBCR1);
if (txing)
{
- if (!(inb (n->io+NE_R0_ISR) & (BIT_ISR_TX+BIT_ISR_TX_ERR)))
+ if (!(inb (device->io+NE_R0_ISR) & (BIT_ISR_TX+BIT_ISR_TX_ERR)))
resend++;
}
- outb (BIT_TCR_LB, n->io + NE_R0_TCR); /* Enter loopback mode */
- outb (NE_NODMA + NE_PAGE0+NE_START, n->io);
+ outb (BIT_TCR_LB, device->io + NE_R0_TCR); /* Enter loopback mode */
+ outb (NE_NODMA + NE_PAGE0+NE_START, device->io);
if (debug >= 1)
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "** - Clearing rx buffer ring");
/* Clear RX ring buffer */
- ne_recv (n);
+ ne_recv (device);
/* Ack. overflow interrupt */
- outb (BIT_ISR_OVERFLW, n->io+NE_R0_ISR);
+ outb (BIT_ISR_OVERFLW, device->io+NE_R0_ISR);
/* Leave loopback mode & resend any stopped packets */
- outb (0, n->io + NE_R0_TCR);
+ outb (0, device->io + NE_R0_TCR);
if (resend)
- outb (NE_NODMA + NE_PAGE0 + NE_START + NE_TRANS, n->io);
+ outb (NE_NODMA + NE_PAGE0 + NE_START + NE_TRANS, device->io);
/* We're finnished */
log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "** overflow reset done!");
- n->status &= ~NIC_BUSY;
+ device->status &= ~NIC_BUSY;
}
u16 hex2dec (u8 *s)
@@ -709,17 +596,126 @@
/* Open the ne2000 device. */
-static bool ne2000_open (device_type *device __attribute__ ((unused)))
+static bool ne2000_open (device_type *device)
{
- // FIXME
+ /* Create a thread for the IRQ handler and set up an IRQ handler loop. */
+ if (system_thread_create () == SYSTEM_RETURN_THREAD_NEW) {
+ log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "in IRQ thread");
+
+ if (system_call_irq_register (device->irq, PACKAGE_NAME) != SYSTEM_RETURN_SUCCESS)
+ {
+ log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "$@!# Couldn't register irq %d :(", device->irq);
+ /* FIXME: Deallocate I/O space. */
+
+ return FALSE;
+ }
+
+ system_call_thread_name_set ("IRQ handler");
+
+ while (TRUE) {
+ system_call_irq_wait (device->irq);
+ ne_int_handler (device);
+ system_call_irq_acknowledge (device->irq);
+ }
+ }
+
+ ne_init_chip (device, 1);
return TRUE;
}
+// FIXME: should have an accompanying ne2000_close ()...
+
/* Probe for an ne2000 compatible device. */
-static bool ne2000_probe (device_type *device __attribute__ ((unused)))
+static bool ne2000_probe (device_type *device)
{
- // FIXME
+ u8 chk = 0, x;
+ u32 i;
+
+ if (!device || !device->io || !device->irq)
+ {
+ log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "-- Invalid io(0x%x) address or irq(%d)", device->io, device->irq);
+ return FALSE;
+ }
+
+ if (system_call_port_range_register (device->io, 0x1F, PACKAGE_NAME))
+ {
+ log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "-- Cannot allocate 0x%x => 0x%x", device->io, device->io + 0x1f);
+ return FALSE;
+ }
+
+ chk = system_port_in_u8 (device->io);
+ if (chk == 0xff) /* No card found */
+ {
+ log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "-- Nothing found on 0x%x", device->io);
+
+ /* FIXME: deallocate I/O space */
+ return FALSE;
+ }
+
+ /* Check if it really is a NE2k card */
+ outb (NE_NODMA + NE_PAGE1 + NE_STOP, device->io); /* Stop the card */
+ x = inb (device->io + NE_R0_CNTR0);
+ outb (0xff, device->io + NE_R0_CNTR0);
+ outb (NE_NODMA + NE_PAGE0, device->io);
+ inb (device->io + NE_R0_CNTR0); /* Clear the counter by reading */
+
+ if (inb (device->io + NE_R0_CNTR0) != 0) /* Ooops ;) */
+ {
+ outb (chk, device->io);
+ outb (chk, device->io + NE_R0_CNTR0);
+ log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "Something, but not a NE2k card, found. Aborting");
+ return FALSE;
+ }
+
+ ne_reset_chip (device);
+
+ /* We don't ack _all_ interrupts in ne_reset_chip(),
+ so we do it here instead */
+ outb (0xff, device->io + NE_R0_ISR);
+
+
+ /* Init registers and shit */
+ for (i = 0;i < sizeof (ne_preinit_program)/sizeof (ne_program);i++)
+ {
+ outb (ne_preinit_program[i].value, device->io + ne_preinit_program[i].offset);
+ }
+
+ /* It's time to read the station address prom now */
+ for (i = 0, x = 0;i < 32;i += 2)
+ {
+ device->prom[i] = inb (device->io + NE_DATAPORT);
+ device->prom[i+1] = inb (device->io + NE_DATAPORT);
+ if (device->prom[i] != device->prom[i+1])
+ x = 1;
+ }
+
+ if (x) /* This isn't a 16 bit card */
+ {
+ log_print_formatted (&log_structure, LOG_URGENCY_EMERGENCY, "Haha! Your card isn't supported. Get a 16 bit card");
+ return FALSE;
+ }
+
+ for (i = 0;i < 16;i++) {
+ device->prom[i] = device->prom[i + i];
+ }
+
+ for (i = 0; i < 6; i++) {
+ device->ethernet_address[i] = device->prom[i];
+ }
+
+ log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "MAC address is %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x"
+ " and signature [0x%x 0x%x]",
+ device->prom[0], device->prom[1], device->prom[2],
+ device->prom[3], device->prom[4], device->prom[5],
+ device->prom[14], device->prom[15]);
+
+ outb (0x49, device->io + NE_R0_DCR); /* Set the card in word-wide mode */
+
+ /* this code should probably wait here until the IRQ handler etc has
+ been setup... */
+
+ ne_init_chip (device, 0);
return TRUE;
}
@@ -835,7 +831,7 @@
while (TRUE)
{
mailbox_id_type reply_mailbox_id;
-
+
ipc_service_connection_wait (&ipc_structure);
reply_mailbox_id = ipc_structure.output_mailbox_id;
@@ -851,6 +847,7 @@
int main (void)
{
+ device_type *device;
bool found;
/* Set up our name. */
@@ -867,26 +864,31 @@
log_print_formatted (&log_structure, LOG_URGENCY_INFORMATIVE, "NE2000 server by noah williamsson");
- do
- {
- device_type *device;
+ memory_allocate ((void **) &device, sizeof (device_type));
+
+ // FIXME: Hardwired for now. These are the values that Bochs use
+ // by default, that's why I'm choosing them.
+ device->io = 0x300;
+ device->irq = 3;
- memory_allocate ((void **) &device, sizeof (device_type));
- found = ne2000_probe (device);
-
- if (!found)
+ device->num_dropped = 0;
+ device->num_interrupts = 0;
+
+ found = ne2000_probe (device);
+
+ if (!found)
+ {
+ log_print_formatted(&log_structure, LOG_URGENCY_INFORMATIVE, "!found");
+ memory_deallocate ((void **) &device);
+ }
+ else
+ {
+ if (system_thread_create () == SYSTEM_RETURN_THREAD_NEW)
{
- memory_deallocate ((void **) &device);
+ handle_device (device);
+ return 0;
}
- else
- {
- if (system_thread_create () == SYSTEM_RETURN_THREAD_NEW)
- {
- handle_device (device);
- return 0;
- }
- }
- } while (found);
+ }
system_call_process_parent_unblock ();
@@ -994,11 +996,6 @@
switch (message[0])
{
- case NE_START_CARD:
- log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "Starting card->. (pid %ld wants this..)", from);
- ne_init_chip (&card, 1);
- break;
-
case NE_STOP_CARD:
log_print_formatted (&log_structure, LOG_URGENCY_DEBUG, "Stopping card->. (pid %ld wants this..)", from);
ne_init_chip (&card, 0);
Modified: trunk/chaos-old/servers/network/ne2000/ne2000.h
===================================================================
--- trunk/chaos-old/servers/network/ne2000/ne2000.h 2007-03-12 20:30:09 UTC (rev 1227)
+++ trunk/chaos-old/servers/network/ne2000/ne2000.h 2007-03-13 23:03:05 UTC (rev 1228)
@@ -95,7 +95,7 @@
u16 check;
u32 saddr;
u32 daddr;
-};
+} __attribute__ ((packed));
struct tcphdr {
@@ -115,7 +115,7 @@
u16 window;
u16 check;
u16 urg_ptr;
-};
+} __attribute__ ((packed));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <per...@us...> - 2007-03-12 20:30:18
|
Revision: 1227
http://chaos.svn.sourceforge.net/chaos/?rev=1227&view=rev
Author: perlundberg
Date: 2007-03-12 13:30:09 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Added the rest of the missing files. We should be up-to-date with the 20001010 (plus some minor patches by me) now so now it's happy hacking time. :)
Modified Paths:
--------------
trunk/chaos-old/libraries/ipc/file.h
trunk/chaos-old/libraries/ipc/protocols.h
trunk/chaos-old/servers/system/boot/boot.c
trunk/chaos-old/servers/system/pci/pci-id.c
Added Paths:
-----------
trunk/chaos-old/programs/startup
trunk/chaos-old/servers/block/ata/autochaos.rules
trunk/chaos-old/servers/block/ata/changelog
trunk/chaos-old/servers/block/ata/configure
trunk/chaos-old/servers/file_system/fat/autochaos.rules
trunk/chaos-old/servers/file_system/fat/changelog
trunk/chaos-old/servers/file_system/fat/configure
trunk/chaos-old/servers/file_system/kernelfs/autochaos.rules
trunk/chaos-old/servers/file_system/kernelfs/changelog
trunk/chaos-old/servers/file_system/kernelfs/configure
trunk/chaos-old/servers/file_system/servicefs/autochaos.rules
trunk/chaos-old/servers/file_system/servicefs/changelog
trunk/chaos-old/servers/file_system/servicefs/configure
trunk/chaos-old/servers/file_system/virtual_file_system/autochaos.rules
trunk/chaos-old/servers/file_system/virtual_file_system/changelog
trunk/chaos-old/servers/file_system/virtual_file_system/configure
trunk/chaos-old/servers/network/3c509/AUTHORS
trunk/chaos-old/servers/network/3c509/README
trunk/chaos-old/servers/network/3c509/autochaos.rules
trunk/chaos-old/servers/network/3c509/configure
trunk/chaos-old/servers/network/3com-pci/autochaos.rules
trunk/chaos-old/servers/network/3com-pci/configure
trunk/chaos-old/servers/network/ipv4/AUTHORS
trunk/chaos-old/servers/network/ipv4/README
trunk/chaos-old/servers/network/ipv4/TODO
trunk/chaos-old/servers/network/ipv4/autochaos.rules
trunk/chaos-old/servers/network/ipv4/changelog
trunk/chaos-old/servers/network/ipv4/configure
trunk/chaos-old/servers/network/loopback/autochaos.rules
trunk/chaos-old/servers/network/loopback/configure
trunk/chaos-old/servers/network/realtek-pci/autochaos.rules
trunk/chaos-old/servers/network/realtek-pci/configure
trunk/chaos-old/servers/network/tulip/autochaos.rules
trunk/chaos-old/servers/network/tulip/configure
trunk/chaos-old/servers/network/via-rhine/autochaos.rules
trunk/chaos-old/servers/network/via-rhine/configure
trunk/chaos-old/servers/other/serial/autochaos.rules
trunk/chaos-old/servers/other/serial/changelog
trunk/chaos-old/servers/other/serial/configure
trunk/chaos-old/servers/sound/soundblaster/AUTHORS
trunk/chaos-old/servers/sound/soundblaster/README
trunk/chaos-old/servers/sound/soundblaster/autochaos.rules
trunk/chaos-old/servers/sound/soundblaster/configure
trunk/chaos-old/servers/sound/soundblaster/sblaster.doc
trunk/chaos-old/servers/system/boot/autochaos.rules
trunk/chaos-old/servers/system/boot/changelog
trunk/chaos-old/servers/system/boot/configure
trunk/chaos-old/servers/system/console/AUTHORS
trunk/chaos-old/servers/system/console/README
trunk/chaos-old/servers/system/console/autochaos.rules
trunk/chaos-old/servers/system/console/configure
trunk/chaos-old/servers/system/keyboard/AUTHORS
trunk/chaos-old/servers/system/keyboard/README
trunk/chaos-old/servers/system/keyboard/autochaos.rules
trunk/chaos-old/servers/system/keyboard/changelog
trunk/chaos-old/servers/system/keyboard/configure
trunk/chaos-old/servers/system/keyboard/keyboard_maps/
trunk/chaos-old/servers/system/keyboard/keyboard_maps/british.h
trunk/chaos-old/servers/system/keyboard/keyboard_maps/dvorak.h
trunk/chaos-old/servers/system/keyboard/keyboard_maps/swedish.h
trunk/chaos-old/servers/system/keyboard/keyboard_maps/us.h
trunk/chaos-old/servers/system/log/autochaos.rules
trunk/chaos-old/servers/system/log/configure
trunk/chaos-old/servers/system/pci/README
trunk/chaos-old/servers/system/pci/TODO
trunk/chaos-old/servers/system/pci/autochaos.rules
trunk/chaos-old/servers/system/pci/changelog
trunk/chaos-old/servers/system/pci/configure
trunk/chaos-old/servers/system/pci/makefile.template
trunk/chaos-old/servers/system/pci/pci.ids
trunk/chaos-old/servers/system/pci/pci.pl
trunk/chaos-old/servers/video/vga/autochaos.rules
trunk/chaos-old/servers/video/vga/changelog
trunk/chaos-old/servers/video/vga/configure
trunk/chaos-old/servers/video/vga/vgalib.asm
trunk/chaos-old/storm/current-arch
trunk/chaos-old/storm/generic/README
trunk/chaos-old/storm/generic/makefile.template
trunk/chaos-old/storm/ia32/irq_handlers.S
trunk/chaos-old/storm/ia32/kernel.ld
trunk/chaos-old/storm/ia32/makefile.template
trunk/chaos-old/storm/ia32/system_calls.pl
trunk/chaos-old/storm/include/
trunk/chaos-old/storm/include/makefile
trunk/chaos-old/storm/include/stamp-h
trunk/chaos-old/storm/include/storm/
trunk/chaos-old/storm/include/storm/current-arch
trunk/chaos-old/storm/include/storm/defines.h
trunk/chaos-old/storm/include/storm/dma.h
trunk/chaos-old/storm/include/storm/generic/
trunk/chaos-old/storm/include/storm/generic/arguments.h
trunk/chaos-old/storm/include/storm/generic/avl.h
trunk/chaos-old/storm/include/storm/generic/avl_debug.h
trunk/chaos-old/storm/include/storm/generic/avl_delete.h
trunk/chaos-old/storm/include/storm/generic/avl_rotate.h
trunk/chaos-old/storm/include/storm/generic/avl_update.h
trunk/chaos-old/storm/include/storm/generic/bit.h
trunk/chaos-old/storm/include/storm/generic/capability.h
trunk/chaos-old/storm/include/storm/generic/cpu.h
trunk/chaos-old/storm/include/storm/generic/dataarea.h
trunk/chaos-old/storm/include/storm/generic/debug.h
trunk/chaos-old/storm/include/storm/generic/defines.h
trunk/chaos-old/storm/include/storm/generic/dispatch.h
trunk/chaos-old/storm/include/storm/generic/elf.h
trunk/chaos-old/storm/include/storm/generic/idle.h
trunk/chaos-old/storm/include/storm/generic/init.h
trunk/chaos-old/storm/include/storm/generic/irq.h
trunk/chaos-old/storm/include/storm/generic/kernelfs.h
trunk/chaos-old/storm/include/storm/generic/limits.h
trunk/chaos-old/storm/include/storm/generic/log.h
trunk/chaos-old/storm/include/storm/generic/mailbox.h
trunk/chaos-old/storm/include/storm/generic/makefile
trunk/chaos-old/storm/include/storm/generic/memory.h
trunk/chaos-old/storm/include/storm/generic/memory_global.h
trunk/chaos-old/storm/include/storm/generic/memory_physical.h
trunk/chaos-old/storm/include/storm/generic/memory_virtual.h
trunk/chaos-old/storm/include/storm/generic/multiboot.h
trunk/chaos-old/storm/include/storm/generic/mutex.h
trunk/chaos-old/storm/include/storm/generic/port.h
trunk/chaos-old/storm/include/storm/generic/process.h
trunk/chaos-old/storm/include/storm/generic/return_values.h
trunk/chaos-old/storm/include/storm/generic/service.h
trunk/chaos-old/storm/include/storm/generic/slab.h
trunk/chaos-old/storm/include/storm/generic/string.h
trunk/chaos-old/storm/include/storm/generic/system_call.h
trunk/chaos-old/storm/include/storm/generic/tag.h
trunk/chaos-old/storm/include/storm/generic/thread.h
trunk/chaos-old/storm/include/storm/generic/time.h
trunk/chaos-old/storm/include/storm/generic/timer.h
trunk/chaos-old/storm/include/storm/generic/types.h
trunk/chaos-old/storm/include/storm/ia32/
trunk/chaos-old/storm/include/storm/ia32/cluster.h
trunk/chaos-old/storm/include/storm/ia32/cpu.h
trunk/chaos-old/storm/include/storm/ia32/cpuid.h
trunk/chaos-old/storm/include/storm/ia32/debug.h
trunk/chaos-old/storm/include/storm/ia32/defines.h
trunk/chaos-old/storm/include/storm/ia32/descriptor.h
trunk/chaos-old/storm/include/storm/ia32/dma.h
trunk/chaos-old/storm/include/storm/ia32/flags.h
trunk/chaos-old/storm/include/storm/ia32/gdt.h
trunk/chaos-old/storm/include/storm/ia32/idt.h
trunk/chaos-old/storm/include/storm/ia32/irq.h
trunk/chaos-old/storm/include/storm/ia32/makefile
trunk/chaos-old/storm/include/storm/ia32/memory.h
trunk/chaos-old/storm/include/storm/ia32/memory_virtual.h
trunk/chaos-old/storm/include/storm/ia32/mutex.h
trunk/chaos-old/storm/include/storm/ia32/port.h
trunk/chaos-old/storm/include/storm/ia32/string.h
trunk/chaos-old/storm/include/storm/ia32/system_calls.h
trunk/chaos-old/storm/include/storm/ia32/thread.h
trunk/chaos-old/storm/include/storm/ia32/timer.h
trunk/chaos-old/storm/include/storm/ia32/trap.h
trunk/chaos-old/storm/include/storm/ia32/tss.h
trunk/chaos-old/storm/include/storm/ia32/types.h
trunk/chaos-old/storm/include/storm/ia32/wrapper.h
trunk/chaos-old/storm/include/storm/kernelfs.h
trunk/chaos-old/storm/include/storm/limits.h
trunk/chaos-old/storm/include/storm/mailbox.h
trunk/chaos-old/storm/include/storm/makefile
trunk/chaos-old/storm/include/storm/makefile.template
trunk/chaos-old/storm/include/storm/process.h
trunk/chaos-old/storm/include/storm/return_values.h
trunk/chaos-old/storm/include/storm/service.h
trunk/chaos-old/storm/include/storm/stamp-h.in
trunk/chaos-old/storm/include/storm/state.h
trunk/chaos-old/storm/include/storm/storm.h
trunk/chaos-old/storm/include/storm/system_calls.h
trunk/chaos-old/storm/include/storm/tag.h
trunk/chaos-old/storm/include/storm/thread.h
trunk/chaos-old/storm/include/storm/types.h
trunk/chaos-old/stormG2/ia32/kernel.ld
trunk/chaos-old/stormG2/ia32/makefile.template
trunk/chaos-old/stormG2/include/
trunk/chaos-old/stormG2/include/storm/
trunk/chaos-old/stormG2/include/storm/defines.h
trunk/chaos-old/stormG2/include/storm/generic/
trunk/chaos-old/stormG2/include/storm/generic/bit.h
trunk/chaos-old/stormG2/include/storm/generic/debug.h
trunk/chaos-old/stormG2/include/storm/generic/defines.h
trunk/chaos-old/stormG2/include/storm/generic/dispatch.h
trunk/chaos-old/stormG2/include/storm/generic/id.h
trunk/chaos-old/stormG2/include/storm/generic/list.h
trunk/chaos-old/stormG2/include/storm/generic/main.h
trunk/chaos-old/stormG2/include/storm/generic/memory.h
trunk/chaos-old/stormG2/include/storm/generic/memory_global.h
trunk/chaos-old/stormG2/include/storm/generic/memory_physical.h
trunk/chaos-old/stormG2/include/storm/generic/memory_virtual.h
trunk/chaos-old/stormG2/include/storm/generic/multiboot.h
trunk/chaos-old/stormG2/include/storm/generic/process.h
trunk/chaos-old/stormG2/include/storm/generic/slab.h
trunk/chaos-old/stormG2/include/storm/generic/string.h
trunk/chaos-old/stormG2/include/storm/generic/thread.h
trunk/chaos-old/stormG2/include/storm/generic/types.h
trunk/chaos-old/stormG2/include/storm/ia32/
trunk/chaos-old/stormG2/include/storm/ia32/cpu.h
trunk/chaos-old/stormG2/include/storm/ia32/debug.h
trunk/chaos-old/stormG2/include/storm/ia32/defines.h
trunk/chaos-old/stormG2/include/storm/ia32/descriptor.h
trunk/chaos-old/stormG2/include/storm/ia32/exception.h
trunk/chaos-old/stormG2/include/storm/ia32/gdt.h
trunk/chaos-old/stormG2/include/storm/ia32/idt.h
trunk/chaos-old/stormG2/include/storm/ia32/memory.h
trunk/chaos-old/stormG2/include/storm/ia32/memory_physical.h
trunk/chaos-old/stormG2/include/storm/ia32/memory_virtual.h
trunk/chaos-old/stormG2/include/storm/ia32/string.h
trunk/chaos-old/stormG2/include/storm/ia32/types.h
trunk/chaos-old/stormG2/include/storm/limits.h
trunk/chaos-old/stormG2/include/storm/makefile.template
trunk/chaos-old/stormG2/include/storm/return_values.h
trunk/chaos-old/stormG2/include/storm/types.h
Removed Paths:
-------------
trunk/chaos-old/programs/defines/
Property Changed:
----------------
trunk/chaos-old/programs/cluido/
trunk/chaos-old/programs/tetris/
trunk/chaos-old/servers/block/initial_ramdisk/
Modified: trunk/chaos-old/libraries/ipc/file.h
===================================================================
--- trunk/chaos-old/libraries/ipc/file.h 2007-03-11 20:54:03 UTC (rev 1226)
+++ trunk/chaos-old/libraries/ipc/file.h 2007-03-12 20:30:09 UTC (rev 1227)
@@ -131,10 +131,6 @@
/* The location where we want this volume to be mounted. */
char location[MAX_PATH_NAME_LENGTH];
-
- /* The mailbox of the block device server for this volume. */
-
- mailbox_id_type mailbox_id;
} file_mount_type;
typedef struct
Modified: trunk/chaos-old/libraries/ipc/protocols.h
===================================================================
--- trunk/chaos-old/libraries/ipc/protocols.h 2007-03-11 20:54:03 UTC (rev 1226)
+++ trunk/chaos-old/libraries/ipc/protocols.h 2007-03-12 20:30:09 UTC (rev 1227)
@@ -46,6 +46,7 @@
IPC_PROTOCOL_ETHERNET,
IPC_PROTOCOL_IPV4,
IPC_PROTOCOL_BLOCK,
+ IPC_PROTOCOL_VIRTUAL_FILE_SYSTEM,
IPC_PROTOCOL_FILE,
IPC_PROTOCOL_LOG,
IPC_PROTOCOL_SERIAL,
Property changes on: trunk/chaos-old/programs/cluido
___________________________________________________________________
Name: svn:ignore
+ cluido
Added: trunk/chaos-old/programs/startup
===================================================================
--- trunk/chaos-old/programs/startup (rev 0)
+++ trunk/chaos-old/programs/startup 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1 @@
+programs/cluido
Property changes on: trunk/chaos-old/programs/tetris
___________________________________________________________________
Name: svn:ignore
+ tetris
Added: trunk/chaos-old/servers/block/ata/autochaos.rules
===================================================================
--- trunk/chaos-old/servers/block/ata/autochaos.rules (rev 0)
+++ trunk/chaos-old/servers/block/ata/autochaos.rules 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Id: autochaos.rules,v 1.3 2000/10/20 21:45:34 plundis Exp $ -->
+
+<autochaos>
+ <package name="ata" version="0.0.1" type="server" license="GPL">
+ <library type="depend">log</library>
+ <library type="depend">ipc</library>
+ <library type="depend">string</library>
+ <library type="depend">system</library>
+ <library type="depend">memory</library>
+ <makefile>makefile</makefile>
+
+ <!-- Sources. -->
+
+ <source>ata.c</source>
+ <source>main.c</source>
+ </package>
+</autochaos>
+
+<!--
+
+Local Variables:
+ mode: html
+End:
+
+-->
\ No newline at end of file
Added: trunk/chaos-old/servers/block/ata/changelog
===================================================================
--- trunk/chaos-old/servers/block/ata/changelog (rev 0)
+++ trunk/chaos-old/servers/block/ata/changelog 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,6 @@
+2000-08-31 Per Lundberg <pl...@ch...>
+
+ * Made the code compile.
+
+ * Started writing this change log.
+
Added: trunk/chaos-old/servers/block/ata/configure
===================================================================
--- trunk/chaos-old/servers/block/ata/configure (rev 0)
+++ trunk/chaos-old/servers/block/ata/configure 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,486 @@
+#! /usr/bin/perl -w
+
+# Abstract: Script for configuring this package.
+
+# Copyright 2000 chaos development. This script is in the public domain.
+
+# Please note that this script was automatically generated by
+# autochaos 0.2.1. It should not be modified. Do the changes you
+# want in autochaos instead.
+
+use strict;
+use POSIX;
+
+my $chaos_root = "/tftpboot/chaos";
+my @libraries = ();
+my @headers = ();
+my @sources = ();
+my @objects = ();
+my @deps = ();
+my $MAKEFILE;
+my $TEMPLATE;
+my $root_dir = getcwd ();
+my %options =
+(
+);
+
+my $install_prefix_flag = 0;
+
+foreach my $argument (@ARGV)
+{
+ if ($install_prefix_flag eq 1)
+ {
+ $chaos_root = $argument;
+ $install_prefix_flag = 0;
+ }
+ else
+ {
+ if ($argument eq '--install-prefix')
+ {
+ $install_prefix_flag = 1;
+ }
+ elsif ($argument =~ m/--enable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--enable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'TRUE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ elsif ($argument =~ m/--disable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--disable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'FALSE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+}
+
+if ($install_prefix_flag eq 1)
+{
+ print "Malformed --install-prefix command option. Value missing.\n";
+ exit 1;
+}
+
+print "\n Configuring server: ata...\n\n";
+
+print ("Using chaos root... ($chaos_root)\n");
+
+print ("Checking for log library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_log.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "log");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: log is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for ipc library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_ipc.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "ipc");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: ipc is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for string library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_string.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "string");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: string is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for system library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_system.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "system");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: system is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for memory library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_memory.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "memory");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: memory is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+
+my $all_arguments = "";
+foreach my $argument (@ARGV)
+{
+ $all_arguments .= $argument . " ";
+}
+
+print ("Checking for autochaos... ");
+my $autochaos = `autochaos --version 2> /dev/null`;
+
+my $has_autochaos;
+unless ($autochaos)
+{
+ print ("not found.\n");
+ $has_autochaos = undef;
+}
+else
+{
+ (my $version) = ($autochaos =~ m/ ([\d\.]+)$/);
+ print ("found (version $version).\n");
+ $has_autochaos = $version;
+}
+
+
+
+@headers = (
+);
+
+@sources = (
+'ata.c',
+'main.c',
+);
+@objects = ('ata.o',
+'main.o',
+);
+@deps = ('ata.dep',
+'main.dep',
+);
+ print "Writing ./makefile...
+";
+ open (MAKEFILE, '>' . "./makefile") or
+ die ("Could not write to ./makefile: $!\n");
+
+# Write the default rules we want.
+
+ print (MAKEFILE <<STOP);
+# This makefile was generated by autochaos 0.2.1. Please do not
+# tamper with it unless you are very certain about what you are doing.
+
+ALL_ARGUMENTS = $all_arguments
+
+PREFIX = $chaos_root
+PACKAGE = ata
+
+# Compiler flags.
+
+CFLAGS = -Wall -W -Wshadow -Wpointer-arith -Waggregate-return \\
+-Wstrict-prototypes -Wredundant-decls -Winline -Wmissing-prototypes \\
+-Werror -Wcast-align -Wbad-function-cast -Wsign-compare \\
+-Wmissing-declarations -Wmissing-noreturn -pipe \\
+-Wnested-externs -O3 -fno-builtin -funsigned-char -g \$(EXTRA_CFLAGS) \$(DEFINES)
+
+INCLUDES = \\
+STOP
+print (MAKEFILE <<STOP);
+-I. -I\$(PREFIX)/data/programming/c/headers
+STOP
+ print MAKEFILE "
+ALL_OBJECTS =";
+ print MAKEFILE " \\\
+./ata.o";
+ print MAKEFILE " \\\
+./main.o";
+ print MAKEFILE "
+";
+print (MAKEFILE <<STOP);
+
+STATIC_LIBRARY_PATH = \$(PREFIX)/data/programming/libraries/static
+
+# Ideally, this would be -lwhatever, but we have not started patching
+# the GNU tools yet...
+
+STOP
+
+ print (MAKEFILE "LIBS = ");
+ foreach my $library (@libraries)
+ {
+ print MAKEFILE "\\\
+\$(STATIC_LIBRARY_PATH)/library_$library.a ";
+ }
+
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE "\n\nOBJECTS = ";
+ foreach my $object (@objects)
+ {
+ print MAKEFILE " \\\
+$object";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @headers > 0)
+ {
+ print MAKEFILE "\n\nHEADERS = ";
+ foreach my $header (@headers)
+ {
+ print MAKEFILE " \\\
+$header";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @sources > 0)
+ {
+ print MAKEFILE "\n\nSOURCES = ";
+ foreach my $source (@sources)
+ {
+ print MAKEFILE " \\\
+$source";
+ }
+ print MAKEFILE "\
+";
+
+ }
+
+ print (MAKEFILE <<STOP);
+
+HEADER_PATH = \$(PREFIX)/data/programming/c/headers/\$(PACKAGE)/.
+
+# TODO: Those should be overridable.
+
+CC = gcc-2.95
+NASM = nasm
+AR = ar
+RANLIB = ranlib
+GZIP = gzip -f
+
+%.o: %.c
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.S
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.asm
+ \$(NASM) -o \$(@) \$< -f elf
+
+.PHONY: splash all clean install package-source package-check package
+
+STOP
+
+ {
+ my $target = "ata" if (scalar @objects);
+
+ unless ($target)
+ {
+ $target = "";
+ }
+
+ print (MAKEFILE <<STOP);
+all: splash makefile $target
+STOP
+
+ }
+ if (!(scalar @objects) && 'ata' ne '\$(OBJECTS)')
+ {
+ print (MAKEFILE <<STOP);
+ \@\$(MAKE) ata
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+clean:
+STOP
+ print MAKEFILE " rm -f ata
+";
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE " rm -f \$(OBJECTS)
+";
+ }
+ print (MAKEFILE <<STOP);
+ rm -f *.dep
+ -\$(MAKE) clean-local
+STOP
+
+# FIXME: Pass all parameters to the configure script at this
+# point. Also, make sure the make process is restarted. (fork?)
+
+# FIXME: Support conditional gzipping.
+ print (MAKEFILE <<STOP);
+makefile: configure
+ @./configure
+
+splash:
+ \@echo -e "\\n Compiling server: ata...\\n"
+
+STOP
+
+ if ($has_autochaos)
+ {
+ print (MAKEFILE <<STOP);
+configure: autochaos.rules
+ \@autochaos
+
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+LDFLAGS = \$(PREFIX)/data/programming/c/startup/startup.o \\
+-nostdlib -Wl,-T,\$(PREFIX)/data/programming/linker/chaos.ld -lgcc \$(EXTRA_LDFLAGS)
+
+ata: \$(OBJECTS)
+ \@echo "Linking..."
+ \@\$(CC) -o \$(\@) \$(OBJECTS) \$(LIBS) \$(LDFLAGS)
+
+install: all
+ \@echo "Installing..."
+ \@mkdir -p \$(PREFIX)/system/servers
+ \@cp ata \$(PREFIX)/system/servers
+ \@strip -R .note -R .comment -R .eh_frame \$(PREFIX)/system/servers/ata
+ \@\$(GZIP) \$(PREFIX)/system/servers/ata # > \$(PREFIX)/system/servers/ata.gz
+STOP
+ print (MAKEFILE "\n");
+
+ print (MAKEFILE <<STOP);
+package-source:
+STOP
+print (MAKEFILE <<STOP);
+ mkdir -p $root_dir/package-source/.
+STOP
+ print (MAKEFILE <<STOP);
+ -cp -f autochaos.rules changelog configure COPYING README AUTHORS TODO INSTALL $root_dir/package-source/.
+STOP
+
+ print (MAKEFILE <<STOP);
+ -cp -f makefile.template \$(EXTRA_FILES) $root_dir/package-source/.
+STOP
+
+ if (scalar @headers > 0)
+ {
+ print (MAKEFILE <<STOP);
+ for header in \$(HEADERS) ; do cp \$\$header $root_dir/package-source/. || exit ; done
+STOP
+ }
+
+ if (scalar @sources > 0)
+ {
+ print (MAKEFILE <<STOP);
+ for source in \$(SOURCES) ; do cp \$\$source $root_dir/package-source/. || exit ; done
+STOP
+ }
+
+ print (MAKEFILE <<STOP);
+package-check: package-source
+ cd package-source && ./configure \$(ALL_ARGUMENTS) && \$(MAKE) && \$(MAKE) clean
+ find package-source -name makefile -exec rm {} ';'
+ rm package-source/config.h
+STOP
+
+ print (MAKEFILE <<STOP);
+package: package-check
+ rm -rf ata-0.0.1
+ mv package-source ata-0.0.1
+ tar cvIf ata-0.0.1.tar.bz2 ata-0.0.1
+
+STOP
+
+ # Include automatically generated dependencies.
+
+ if (scalar @deps > 0)
+ {
+ foreach my $dep (@deps)
+ {
+ print (MAKEFILE "-include $dep\n");
+ }
+ }
+
+ print (MAKEFILE "\n");
+
+ if (open (TEMPLATE, "." . "/makefile.template"))
+ {
+ while (<TEMPLATE>)
+ {
+ my $row = $_;
+
+ print (MAKEFILE $row);
+ }
+ }
+ close (MAKEFILE);
+
+
+ # Now, also write to the config.h
+
+ print "Writing config.h...\
+";
+ my $CONFIG;
+ open (CONFIG, '>config.h');
+ print (CONFIG <<STOP);
+/* Automatically generated by autochaos 0.2.1. Not intended to be
+ hand edited. */
+
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#define PACKAGE_NAME "ata"
+#define PACKAGE_VERSION "0.0.1"
+
+STOP
+
+ foreach my $option (keys %options)
+ {
+ print (CONFIG "#define OPTION_" . uc ($option) . " $options{$option}\n");
+ }
+
+ foreach my $library (@libraries)
+ {
+ print (CONFIG "#include <$library/$library.h>\n");
+ }
+
+ print (CONFIG "\n#endif /* !__CONFIG_H__ */");
+
+ close (CONFIG);
Property changes on: trunk/chaos-old/servers/block/initial_ramdisk
___________________________________________________________________
Name: svn:ignore
+ initial_ramdisk
Added: trunk/chaos-old/servers/file_system/fat/autochaos.rules
===================================================================
--- trunk/chaos-old/servers/file_system/fat/autochaos.rules (rev 0)
+++ trunk/chaos-old/servers/file_system/fat/autochaos.rules 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Id: autochaos.rules,v 1.2 2000/10/11 19:11:05 plundis Exp $ -->
+
+<autochaos>
+ <package name="fat" version="0.0.1" type="server" license="GPL">
+ <library type="depend">file</library>
+ <library type="depend">ipc</library>
+ <library type="depend">log</library>
+ <library type="depend">string</library>
+ <library type="depend">system</library>
+ <library type="depend">memory</library>
+ <makefile>makefile</makefile>
+
+ <!-- Sources -->
+
+ <source>fat.c</source>
+ </package>
+</autochaos>
+
+<!--
+
+Local Variables:
+ mode: html
+End:
+
+-->
\ No newline at end of file
Added: trunk/chaos-old/servers/file_system/fat/changelog
===================================================================
--- trunk/chaos-old/servers/file_system/fat/changelog (rev 0)
+++ trunk/chaos-old/servers/file_system/fat/changelog 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,23 @@
+2000-07-25 Per Lundberg <pl...@ch...>
+
+ * fat.c: Changed some raw system_call functions to use library
+ functions instead.
+
+2000-07-15 Per Lundberg <pl...@ch...>
+
+ * fat.c: Implemented (hopefully working) support for
+ subdirectories.
+
+2000-07-03 Per Lundberg <pl...@ch...>
+
+ * fat/fat.h: Changed initialize to initialise.
+
+2000-03-12 Per Lundberg <pl...@ch...>
+
+ * Made it compile with the new kernel and libraries.
+
+1999-10-31 Per Lundberg <pl...@ch...>
+
+ * Reorganized lots of things. Removed the configure script, created
+ configure.in files for each servers and created a new Makefile.
+
Added: trunk/chaos-old/servers/file_system/fat/configure
===================================================================
--- trunk/chaos-old/servers/file_system/fat/configure (rev 0)
+++ trunk/chaos-old/servers/file_system/fat/configure 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,495 @@
+#! /usr/bin/perl -w
+
+# Abstract: Script for configuring this package.
+
+# Copyright 2000 chaos development. This script is in the public domain.
+
+# Please note that this script was automatically generated by
+# autochaos 0.2.1. It should not be modified. Do the changes you
+# want in autochaos instead.
+
+use strict;
+use POSIX;
+
+my $chaos_root = "/tftpboot/chaos";
+my @libraries = ();
+my @headers = ();
+my @sources = ();
+my @objects = ();
+my @deps = ();
+my $MAKEFILE;
+my $TEMPLATE;
+my $root_dir = getcwd ();
+my %options =
+(
+);
+
+my $install_prefix_flag = 0;
+
+foreach my $argument (@ARGV)
+{
+ if ($install_prefix_flag eq 1)
+ {
+ $chaos_root = $argument;
+ $install_prefix_flag = 0;
+ }
+ else
+ {
+ if ($argument eq '--install-prefix')
+ {
+ $install_prefix_flag = 1;
+ }
+ elsif ($argument =~ m/--enable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--enable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'TRUE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ elsif ($argument =~ m/--disable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--disable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'FALSE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+}
+
+if ($install_prefix_flag eq 1)
+{
+ print "Malformed --install-prefix command option. Value missing.\n";
+ exit 1;
+}
+
+print "\n Configuring server: fat...\n\n";
+
+print ("Using chaos root... ($chaos_root)\n");
+
+print ("Checking for file library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_file.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "file");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: file is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for ipc library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_ipc.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "ipc");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: ipc is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for log library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_log.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "log");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: log is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for string library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_string.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "string");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: string is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for system library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_system.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "system");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: system is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for memory library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_memory.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "memory");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: memory is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+
+my $all_arguments = "";
+foreach my $argument (@ARGV)
+{
+ $all_arguments .= $argument . " ";
+}
+
+print ("Checking for autochaos... ");
+my $autochaos = `autochaos --version 2> /dev/null`;
+
+my $has_autochaos;
+unless ($autochaos)
+{
+ print ("not found.\n");
+ $has_autochaos = undef;
+}
+else
+{
+ (my $version) = ($autochaos =~ m/ ([\d\.]+)$/);
+ print ("found (version $version).\n");
+ $has_autochaos = $version;
+}
+
+
+
+@headers = (
+);
+
+@sources = (
+'fat.c',
+);
+@objects = ('fat.o',
+);
+@deps = ('fat.dep',
+);
+ print "Writing ./makefile...
+";
+ open (MAKEFILE, '>' . "./makefile") or
+ die ("Could not write to ./makefile: $!\n");
+
+# Write the default rules we want.
+
+ print (MAKEFILE <<STOP);
+# This makefile was generated by autochaos 0.2.1. Please do not
+# tamper with it unless you are very certain about what you are doing.
+
+ALL_ARGUMENTS = $all_arguments
+
+PREFIX = $chaos_root
+PACKAGE = fat
+
+# Compiler flags.
+
+CFLAGS = -Wall -W -Wshadow -Wpointer-arith -Waggregate-return \\
+-Wstrict-prototypes -Wredundant-decls -Winline -Wmissing-prototypes \\
+-Werror -Wcast-align -Wbad-function-cast -Wsign-compare \\
+-Wmissing-declarations -Wmissing-noreturns -pipe \\
+-Wnested-externs -O3 -fno-builtin -funsigned-char -g \$(EXTRA_CFLAGS) \$(DEFINES)
+
+INCLUDES = \\
+STOP
+print (MAKEFILE <<STOP);
+-I. -I\$(PREFIX)/data/programming/c/headers
+STOP
+ print MAKEFILE "
+ALL_OBJECTS =";
+ print MAKEFILE " \\\
+./fat.o";
+ print MAKEFILE "
+";
+print (MAKEFILE <<STOP);
+
+STATIC_LIBRARY_PATH = \$(PREFIX)/data/programming/libraries/static
+
+# Ideally, this would be -lwhatever, but we have not started patching
+# the GNU tools yet...
+
+STOP
+
+ print (MAKEFILE "LIBS = ");
+ foreach my $library (@libraries)
+ {
+ print MAKEFILE "\\\
+\$(STATIC_LIBRARY_PATH)/library_$library.a ";
+ }
+
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE "\n\nOBJECTS = ";
+ foreach my $object (@objects)
+ {
+ print MAKEFILE " \\\
+$object";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @headers > 0)
+ {
+ print MAKEFILE "\n\nHEADERS = ";
+ foreach my $header (@headers)
+ {
+ print MAKEFILE " \\\
+$header";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @sources > 0)
+ {
+ print MAKEFILE "\n\nSOURCES = ";
+ foreach my $source (@sources)
+ {
+ print MAKEFILE " \\\
+$source";
+ }
+ print MAKEFILE "\
+";
+
+ }
+
+ print (MAKEFILE <<STOP);
+
+HEADER_PATH = \$(PREFIX)/data/programming/c/headers/\$(PACKAGE)/.
+
+# TODO: Those should be overridable.
+
+CC = gcc-2.95
+NASM = nasm
+AR = ar
+RANLIB = ranlib
+GZIP = gzip -f
+
+%.o: %.c
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.S
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.asm
+ \$(NASM) -o \$(@) \$< -f elf
+
+.PHONY: splash all clean install package-source package-check package
+
+STOP
+
+ {
+ my $target = "fat" if (scalar @objects);
+
+ unless ($target)
+ {
+ $target = "";
+ }
+
+ print (MAKEFILE <<STOP);
+all: splash makefile $target
+STOP
+
+ }
+ if (!(scalar @objects) && 'fat' ne '\$(OBJECTS)')
+ {
+ print (MAKEFILE <<STOP);
+ \@\$(MAKE) fat
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+clean:
+STOP
+ print MAKEFILE " rm -f fat
+";
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE " rm -f \$(OBJECTS)
+";
+ }
+ print (MAKEFILE <<STOP);
+ rm -f *.dep
+ -\$(MAKE) clean-local
+STOP
+
+# FIXME: Pass all parameters to the configure script at this
+# point. Also, make sure the make process is restarted. (fork?)
+
+# FIXME: Support conditional gzipping.
+ print (MAKEFILE <<STOP);
+makefile: configure
+ @./configure
+
+splash:
+ \@echo -e "\\n Compiling server: fat...\\n"
+
+STOP
+
+ if ($has_autochaos)
+ {
+ print (MAKEFILE <<STOP);
+configure: autochaos.rules
+ \@autochaos
+
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+LDFLAGS = \$(PREFIX)/data/programming/c/startup/startup.o \\
+-nostdlib -Wl,-T,\$(PREFIX)/data/programming/linker/chaos.ld -lgcc \$(EXTRA_LDFLAGS)
+
+fat: \$(OBJECTS)
+ \@echo "Linking..."
+ \@\$(CC) -o \$(\@) \$(OBJECTS) \$(LIBS) \$(LDFLAGS)
+
+install: all
+ \@echo "Installing..."
+ \@mkdir -p \$(PREFIX)/system/servers
+ \@cp fat \$(PREFIX)/system/servers
+ \@strip -R .note -R .comment -R .eh_frame \$(PREFIX)/system/servers/fat
+ \@\$(GZIP) \$(PREFIX)/system/servers/fat # > \$(PREFIX)/system/servers/fat.gz
+STOP
+ print (MAKEFILE "\n");
+
+ print (MAKEFILE <<STOP);
+package-source:
+STOP
+print (MAKEFILE <<STOP);
+ mkdir -p $root_dir/package-source/.
+STOP
+ print (MAKEFILE <<STOP);
+ -cp -f autochaos.rules changelog configure COPYING README AUTHORS TODO INSTALL $root_dir/package-source/.
+STOP
+
+ print (MAKEFILE <<STOP);
+ -cp -f makefile.template \$(EXTRA_FILES) $root_dir/package-source/.
+STOP
+
+ if (scalar @headers > 0)
+ {
+ print (MAKEFILE <<STOP);
+ for header in \$(HEADERS) ; do cp \$\$header $root_dir/package-source/. || exit ; done
+STOP
+ }
+
+ if (scalar @sources > 0)
+ {
+ print (MAKEFILE <<STOP);
+ for source in \$(SOURCES) ; do cp \$\$source $root_dir/package-source/. || exit ; done
+STOP
+ }
+
+ print (MAKEFILE <<STOP);
+package-check: package-source
+ cd package-source && ./configure \$(ALL_ARGUMENTS) && \$(MAKE) && \$(MAKE) clean
+ find package-source -name makefile -exec rm {} ';'
+ rm package-source/config.h
+STOP
+
+ print (MAKEFILE <<STOP);
+package: package-check
+ rm -rf fat-0.0.1
+ mv package-source fat-0.0.1
+ tar cvIf fat-0.0.1.tar.bz2 fat-0.0.1
+
+STOP
+
+ # Include automatically generated dependencies.
+
+ if (scalar @deps > 0)
+ {
+ foreach my $dep (@deps)
+ {
+ print (MAKEFILE "-include $dep\n");
+ }
+ }
+
+ print (MAKEFILE "\n");
+
+ if (open (TEMPLATE, "." . "/makefile.template"))
+ {
+ while (<TEMPLATE>)
+ {
+ my $row = $_;
+
+ print (MAKEFILE $row);
+ }
+ }
+ close (MAKEFILE);
+
+
+ # Now, also write to the config.h
+
+ print "Writing config.h...\
+";
+ my $CONFIG;
+ open (CONFIG, '>config.h');
+ print (CONFIG <<STOP);
+/* Automatically generated by autochaos 0.2.1. Not intended to be
+ hand edited. */
+
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#define PACKAGE_NAME "fat"
+#define PACKAGE_VERSION "0.0.1"
+
+STOP
+
+ foreach my $option (keys %options)
+ {
+ print (CONFIG "#define OPTION_" . uc ($option) . " $options{$option}\n");
+ }
+
+ foreach my $library (@libraries)
+ {
+ print (CONFIG "#include <$library/$library.h>\n");
+ }
+
+ print (CONFIG "\n#endif /* !__CONFIG_H__ */");
+
+ close (CONFIG);
Added: trunk/chaos-old/servers/file_system/kernelfs/autochaos.rules
===================================================================
--- trunk/chaos-old/servers/file_system/kernelfs/autochaos.rules (rev 0)
+++ trunk/chaos-old/servers/file_system/kernelfs/autochaos.rules 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Id: autochaos.rules,v 1.2 2000/10/11 19:11:05 plundis Exp $ -->
+
+<autochaos>
+ <package name="kernelfs" version="0.0.1" type="server" license="GPL">
+ <library type="depend">file</library>
+ <library type="depend">ipc</library>
+ <library type="depend">log</library>
+ <library type="depend">string</library>
+ <library type="depend">system</library>
+ <library type="depend">memory</library>
+ <makefile>makefile</makefile>
+
+ <!-- Sources -->
+
+ <source>kernelfs.c</source>
+ </package>
+</autochaos>
+
+<!--
+
+Local Variables:
+ mode: html
+End:
+
+-->
\ No newline at end of file
Added: trunk/chaos-old/servers/file_system/kernelfs/changelog
===================================================================
--- trunk/chaos-old/servers/file_system/kernelfs/changelog (rev 0)
+++ trunk/chaos-old/servers/file_system/kernelfs/changelog 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,5 @@
+2000-08-31 Per Lundberg <pl...@ch...>
+
+ * Started writing the kernelfs server, which provides a file
+ system abstraction of some kernel data.
+
Added: trunk/chaos-old/servers/file_system/kernelfs/configure
===================================================================
--- trunk/chaos-old/servers/file_system/kernelfs/configure (rev 0)
+++ trunk/chaos-old/servers/file_system/kernelfs/configure 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,495 @@
+#! /usr/bin/perl -w
+
+# Abstract: Script for configuring this package.
+
+# Copyright 2000 chaos development. This script is in the public domain.
+
+# Please note that this script was automatically generated by
+# autochaos 0.2.1. It should not be modified. Do the changes you
+# want in autochaos instead.
+
+use strict;
+use POSIX;
+
+my $chaos_root = "/tftpboot/chaos";
+my @libraries = ();
+my @headers = ();
+my @sources = ();
+my @objects = ();
+my @deps = ();
+my $MAKEFILE;
+my $TEMPLATE;
+my $root_dir = getcwd ();
+my %options =
+(
+);
+
+my $install_prefix_flag = 0;
+
+foreach my $argument (@ARGV)
+{
+ if ($install_prefix_flag eq 1)
+ {
+ $chaos_root = $argument;
+ $install_prefix_flag = 0;
+ }
+ else
+ {
+ if ($argument eq '--install-prefix')
+ {
+ $install_prefix_flag = 1;
+ }
+ elsif ($argument =~ m/--enable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--enable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'TRUE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ elsif ($argument =~ m/--disable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--disable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'FALSE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+}
+
+if ($install_prefix_flag eq 1)
+{
+ print "Malformed --install-prefix command option. Value missing.\n";
+ exit 1;
+}
+
+print "\n Configuring server: kernelfs...\n\n";
+
+print ("Using chaos root... ($chaos_root)\n");
+
+print ("Checking for file library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_file.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "file");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: file is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for ipc library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_ipc.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "ipc");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: ipc is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for log library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_log.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "log");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: log is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for string library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_string.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "string");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: string is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for system library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_system.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "system");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: system is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for memory library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_memory.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "memory");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: memory is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+
+my $all_arguments = "";
+foreach my $argument (@ARGV)
+{
+ $all_arguments .= $argument . " ";
+}
+
+print ("Checking for autochaos... ");
+my $autochaos = `autochaos --version 2> /dev/null`;
+
+my $has_autochaos;
+unless ($autochaos)
+{
+ print ("not found.\n");
+ $has_autochaos = undef;
+}
+else
+{
+ (my $version) = ($autochaos =~ m/ ([\d\.]+)$/);
+ print ("found (version $version).\n");
+ $has_autochaos = $version;
+}
+
+
+
+@headers = (
+);
+
+@sources = (
+'kernelfs.c',
+);
+@objects = ('kernelfs.o',
+);
+@deps = ('kernelfs.dep',
+);
+ print "Writing ./makefile...
+";
+ open (MAKEFILE, '>' . "./makefile") or
+ die ("Could not write to ./makefile: $!\n");
+
+# Write the default rules we want.
+
+ print (MAKEFILE <<STOP);
+# This makefile was generated by autochaos 0.2.1. Please do not
+# tamper with it unless you are very certain about what you are doing.
+
+ALL_ARGUMENTS = $all_arguments
+
+PREFIX = $chaos_root
+PACKAGE = kernelfs
+
+# Compiler flags.
+
+CFLAGS = -Wall -W -Wshadow -Wpointer-arith -Waggregate-return \\
+-Wstrict-prototypes -Wredundant-decls -Winline -Wmissing-prototypes \\
+-Werror -Wcast-align -Wbad-function-cast -Wsign-compare \\
+-Wmissing-declarations -Wmissing-noreturns -pipe \\
+-Wnested-externs -O3 -fno-builtin -funsigned-char -g \$(EXTRA_CFLAGS) \$(DEFINES)
+
+INCLUDES = \\
+STOP
+print (MAKEFILE <<STOP);
+-I. -I\$(PREFIX)/data/programming/c/headers
+STOP
+ print MAKEFILE "
+ALL_OBJECTS =";
+ print MAKEFILE " \\\
+./kernelfs.o";
+ print MAKEFILE "
+";
+print (MAKEFILE <<STOP);
+
+STATIC_LIBRARY_PATH = \$(PREFIX)/data/programming/libraries/static
+
+# Ideally, this would be -lwhatever, but we have not started patching
+# the GNU tools yet...
+
+STOP
+
+ print (MAKEFILE "LIBS = ");
+ foreach my $library (@libraries)
+ {
+ print MAKEFILE "\\\
+\$(STATIC_LIBRARY_PATH)/library_$library.a ";
+ }
+
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE "\n\nOBJECTS = ";
+ foreach my $object (@objects)
+ {
+ print MAKEFILE " \\\
+$object";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @headers > 0)
+ {
+ print MAKEFILE "\n\nHEADERS = ";
+ foreach my $header (@headers)
+ {
+ print MAKEFILE " \\\
+$header";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @sources > 0)
+ {
+ print MAKEFILE "\n\nSOURCES = ";
+ foreach my $source (@sources)
+ {
+ print MAKEFILE " \\\
+$source";
+ }
+ print MAKEFILE "\
+";
+
+ }
+
+ print (MAKEFILE <<STOP);
+
+HEADER_PATH = \$(PREFIX)/data/programming/c/headers/\$(PACKAGE)/.
+
+# TODO: Those should be overridable.
+
+CC = gcc-2.95
+NASM = nasm
+AR = ar
+RANLIB = ranlib
+GZIP = gzip -f
+
+%.o: %.c
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.S
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.asm
+ \$(NASM) -o \$(@) \$< -f elf
+
+.PHONY: splash all clean install package-source package-check package
+
+STOP
+
+ {
+ my $target = "kernelfs" if (scalar @objects);
+
+ unless ($target)
+ {
+ $target = "";
+ }
+
+ print (MAKEFILE <<STOP);
+all: splash makefile $target
+STOP
+
+ }
+ if (!(scalar @objects) && 'kernelfs' ne '\$(OBJECTS)')
+ {
+ print (MAKEFILE <<STOP);
+ \@\$(MAKE) kernelfs
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+clean:
+STOP
+ print MAKEFILE " rm -f kernelfs
+";
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE " rm -f \$(OBJECTS)
+";
+ }
+ print (MAKEFILE <<STOP);
+ rm -f *.dep
+ -\$(MAKE) clean-local
+STOP
+
+# FIXME: Pass all parameters to the configure script at this
+# point. Also, make sure the make process is restarted. (fork?)
+
+# FIXME: Support conditional gzipping.
+ print (MAKEFILE <<STOP);
+makefile: configure
+ @./configure
+
+splash:
+ \@echo -e "\\n Compiling server: kernelfs...\\n"
+
+STOP
+
+ if ($has_autochaos)
+ {
+ print (MAKEFILE <<STOP);
+configure: autochaos.rules
+ \@autochaos
+
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+LDFLAGS = \$(PREFIX)/data/programming/c/startup/startup.o \\
+-nostdlib -Wl,-T,\$(PREFIX)/data/programming/linker/chaos.ld -lgcc \$(EXTRA_LDFLAGS)
+
+kernelfs: \$(OBJECTS)
+ \@echo "Linking..."
+ \@\$(CC) -o \$(\@) \$(OBJECTS) \$(LIBS) \$(LDFLAGS)
+
+install: all
+ \@echo "Installing..."
+ \@mkdir -p \$(PREFIX)/system/servers
+ \@cp kernelfs \$(PREFIX)/system/servers
+ \@strip -R .note -R .comment -R .eh_frame \$(PREFIX)/system/servers/kernelfs
+ \@\$(GZIP) \$(PREFIX)/system/servers/kernelfs # > \$(PREFIX)/system/servers/kernelfs.gz
+STOP
+ print (MAKEFILE "\n");
+
+ print (MAKEFILE <<STOP);
+package-source:
+STOP
+print (MAKEFILE <<STOP);
+ mkdir -p $root_dir/package-source/.
+STOP
+ print (MAKEFILE <<STOP);
+ -cp -f autochaos.rules changelog configure COPYING README AUTHORS TODO INSTALL $root_dir/package-source/.
+STOP
+
+ print (MAKEFILE <<STOP);
+ -cp -f makefile.template \$(EXTRA_FILES) $root_dir/package-source/.
+STOP
+
+ if (scalar @headers > 0)
+ {
+ print (MAKEFILE <<STOP);
+ for header in \$(HEADERS) ; do cp \$\$header $root_dir/package-source/. || exit ; done
+STOP
+ }
+
+ if (scalar @sources > 0)
+ {
+ print (MAKEFILE <<STOP);
+ for source in \$(SOURCES) ; do cp \$\$source $root_dir/package-source/. || exit ; done
+STOP
+ }
+
+ print (MAKEFILE <<STOP);
+package-check: package-source
+ cd package-source && ./configure \$(ALL_ARGUMENTS) && \$(MAKE) && \$(MAKE) clean
+ find package-source -name makefile -exec rm {} ';'
+ rm package-source/config.h
+STOP
+
+ print (MAKEFILE <<STOP);
+package: package-check
+ rm -rf kernelfs-0.0.1
+ mv package-source kernelfs-0.0.1
+ tar cvIf kernelfs-0.0.1.tar.bz2 kernelfs-0.0.1
+
+STOP
+
+ # Include automatically generated dependencies.
+
+ if (scalar @deps > 0)
+ {
+ foreach my $dep (@deps)
+ {
+ print (MAKEFILE "-include $dep\n");
+ }
+ }
+
+ print (MAKEFILE "\n");
+
+ if (open (TEMPLATE, "." . "/makefile.template"))
+ {
+ while (<TEMPLATE>)
+ {
+ my $row = $_;
+
+ print (MAKEFILE $row);
+ }
+ }
+ close (MAKEFILE);
+
+
+ # Now, also write to the config.h
+
+ print "Writing config.h...\
+";
+ my $CONFIG;
+ open (CONFIG, '>config.h');
+ print (CONFIG <<STOP);
+/* Automatically generated by autochaos 0.2.1. Not intended to be
+ hand edited. */
+
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#define PACKAGE_NAME "kernelfs"
+#define PACKAGE_VERSION "0.0.1"
+
+STOP
+
+ foreach my $option (keys %options)
+ {
+ print (CONFIG "#define OPTION_" . uc ($option) . " $options{$option}\n");
+ }
+
+ foreach my $library (@libraries)
+ {
+ print (CONFIG "#include <$library/$library.h>\n");
+ }
+
+ print (CONFIG "\n#endif /* !__CONFIG_H__ */");
+
+ close (CONFIG);
Added: trunk/chaos-old/servers/file_system/servicefs/autochaos.rules
===================================================================
--- trunk/chaos-old/servers/file_system/servicefs/autochaos.rules (rev 0)
+++ trunk/chaos-old/servers/file_system/servicefs/autochaos.rules 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- $Id: autochaos.rules,v 1.2 2000/10/22 21:38:16 plundis Exp $ -->
+
+<autochaos>
+ <package name="servicefs" version="0.0.1" type="server" license="GPL">
+ <library type="depend">file</library>
+ <library type="depend">ipc</library>
+ <library type="depend">log</library>
+ <library type="depend">string</library>
+ <library type="depend">system</library>
+ <library type="depend">memory</library>
+ <library type="depend">time</library>
+ <makefile>makefile</makefile>
+
+ <!-- Sources -->
+
+ <source>servicefs.c</source>
+ </package>
+</autochaos>
+
+<!--
+
+Local Variables:
+ mode: html
+End:
+
+-->
Added: trunk/chaos-old/servers/file_system/servicefs/changelog
===================================================================
--- trunk/chaos-old/servers/file_system/servicefs/changelog (rev 0)
+++ trunk/chaos-old/servers/file_system/servicefs/changelog 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,4 @@
+2000-10-20 Per Lundberg <pl...@ch...>
+
+ * New server.
+
Added: trunk/chaos-old/servers/file_system/servicefs/configure
===================================================================
--- trunk/chaos-old/servers/file_system/servicefs/configure (rev 0)
+++ trunk/chaos-old/servers/file_system/servicefs/configure 2007-03-12 20:30:09 UTC (rev 1227)
@@ -0,0 +1,509 @@
+#! /usr/bin/perl -w
+
+# Abstract: Script for configuring this package.
+
+# Copyright 2000 chaos development. This script is in the public domain.
+
+# Please note that this script was automatically generated by
+# autochaos 0.2.1. It should not be modified. Do the changes you
+# want in autochaos instead.
+
+use strict;
+use POSIX;
+
+my $chaos_root = "/tftpboot/chaos";
+my @libraries = ();
+my @headers = ();
+my @sources = ();
+my @objects = ();
+my @deps = ();
+my $MAKEFILE;
+my $TEMPLATE;
+my $root_dir = getcwd ();
+my %options =
+(
+);
+
+my $install_prefix_flag = 0;
+
+foreach my $argument (@ARGV)
+{
+ if ($install_prefix_flag eq 1)
+ {
+ $chaos_root = $argument;
+ $install_prefix_flag = 0;
+ }
+ else
+ {
+ if ($argument eq '--install-prefix')
+ {
+ $install_prefix_flag = 1;
+ }
+ elsif ($argument =~ m/--enable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--enable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'TRUE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ elsif ($argument =~ m/--disable-.*$/)
+ {
+ (my $option) = ($argument =~ m/--disable-(.*)$/);
+
+ if ($options{$option})
+ {
+ $options{$option} = 'FALSE';
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+ else
+ {
+ print "Unrecognised command line option.\n";
+ exit 1;
+ }
+ }
+}
+
+if ($install_prefix_flag eq 1)
+{
+ print "Malformed --install-prefix command option. Value missing.\n";
+ exit 1;
+}
+
+print "\n Configuring server: servicefs...\n\n";
+
+print ("Using chaos root... ($chaos_root)\n");
+
+print ("Checking for file library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_file.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "file");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: file is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for ipc library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_ipc.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "ipc");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: ipc is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for log library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_log.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "log");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: log is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for string library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_string.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "string");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: string is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for system library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_system.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "system");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: system is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for memory library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_memory.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "memory");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: memory is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+print ("Checking for time library... ");
+if (-f "$chaos_root/data/programming/libraries/static/library_time.a")
+{
+ print ("found.\n");
+
+ push (@libraries, "time");
+}
+else
+{
+ print ("not found.\n");
+ print ("\nError: time is a required library. Please check your configuration.\n\n");
+ exit 1;
+}
+
+
+my $all_arguments = "";
+foreach my $argument (@ARGV)
+{
+ $all_arguments .= $argument . " ";
+}
+
+print ("Checking for autochaos... ");
+my $autochaos = `autochaos --version 2> /dev/null`;
+
+my $has_autochaos;
+unless ($autochaos)
+{
+ print ("not found.\n");
+ $has_autochaos = undef;
+}
+else
+{
+ (my $version) = ($autochaos =~ m/ ([\d\.]+)$/);
+ print ("found (version $version).\n");
+ $has_autochaos = $version;
+}
+
+
+
+@headers = (
+);
+
+@sources = (
+'servicefs.c',
+);
+@objects = ('servicefs.o',
+);
+@deps = ('servicefs.dep',
+);
+ print "Writing ./makefile...
+";
+ open (MAKEFILE, '>' . "./makefile") or
+ die ("Could not write to ./makefile: $!\n");
+
+# Write the default rules we want.
+
+ print (MAKEFILE <<STOP);
+# This makefile was generated by autochaos 0.2.1. Please do not
+# tamper with it unless you are very certain about what you are doing.
+
+ALL_ARGUMENTS = $all_arguments
+
+PREFIX = $chaos_root
+PACKAGE = servicefs
+
+# Compiler flags.
+
+CFLAGS = -Wall -W -Wshadow -Wpointer-arith -Waggregate-return \\
+-Wstrict-prototypes -Wredundant-decls -Winline -Wmissing-prototypes \\
+-Werror -Wcast-align -Wbad-function-cast -Wsign-compare \\
+-Wmissing-declarations -Wmissing-noreturns -pipe \\
+-Wnested-externs -O3 -fno-builtin -funsigned-char -g \$(EXTRA_CFLAGS) \$(DEFINES)
+
+INCLUDES = \\
+STOP
+print (MAKEFILE <<STOP);
+-I. -I\$(PREFIX)/data/programming/c/headers
+STOP
+ print MAKEFILE "
+ALL_OBJECTS =";
+ print MAKEFILE " \\\
+./servicefs.o";
+ print MAKEFILE "
+";
+print (MAKEFILE <<STOP);
+
+STATIC_LIBRARY_PATH = \$(PREFIX)/data/programming/libraries/static
+
+# Ideally, this would be -lwhatever, but we have not started patching
+# the GNU tools yet...
+
+STOP
+
+ print (MAKEFILE "LIBS = ");
+ foreach my $library (@libraries)
+ {
+ print MAKEFILE "\\\
+\$(STATIC_LIBRARY_PATH)/library_$library.a ";
+ }
+
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE "\n\nOBJECTS = ";
+ foreach my $object (@objects)
+ {
+ print MAKEFILE " \\\
+$object";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @headers > 0)
+ {
+ print MAKEFILE "\n\nHEADERS = ";
+ foreach my $header (@headers)
+ {
+ print MAKEFILE " \\\
+$header";
+ }
+ print MAKEFILE "\
+";
+ }
+
+ if (scalar @sources > 0)
+ {
+ print MAKEFILE "\n\nSOURCES = ";
+ foreach my $source (@sources)
+ {
+ print MAKEFILE " \\\
+$source";
+ }
+ print MAKEFILE "\
+";
+
+ }
+
+ print (MAKEFILE <<STOP);
+
+HEADER_PATH = \$(PREFIX)/data/programming/c/headers/\$(PACKAGE)/.
+
+# TODO: Those should be overridable.
+
+CC = gcc-2.95
+NASM = nasm
+AR = ar
+RANLIB = ranlib
+GZIP = gzip -f
+
+%.o: %.c
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.S
+ \@echo Compiling \$<...
+ \@\$(CC) -o \$(@) \$(CFLAGS) \$(INCLUDES) \$(DEFS) -c \$<
+ \@\$(CC) -M \$< \$(CFLAGS) \$(INCLUDES) \$(DEFS) > \$(*F).dep
+
+%.o: %.asm
+ \$(NASM) -o \$(@) \$< -f elf
+
+.PHONY: splash all clean install package-source package-check package
+
+STOP
+
+ {
+ my $target = "servicefs" if (scalar @objects);
+
+ unless ($target)
+ {
+ $target = "";
+ }
+
+ print (MAKEFILE <<STOP);
+all: splash makefile $target
+STOP
+
+ }
+ if (!(scalar @objects) && 'servicefs' ne '\$(OBJECTS)')
+ {
+ print (MAKEFILE <<STOP);
+ \@\$(MAKE) servicefs
+STOP
+ }
+ print (MAKEFILE <<STOP);
+
+clean:
+STOP
+ print MAKEFILE " rm -f servicefs
+";
+ if (scalar @objects > 0)
+ {
+ print MAKEFILE " rm -f \$(OBJECTS)
+";
+ }
+ print (MAKEFILE <<STOP);
+ rm -f *.dep
+ -\$(MAKE) clean-local
+STOP
+
+# FIXME: Pass all parameters to the configure script at this
+# point. Also,...
[truncated message content] |
|
From: <per...@us...> - 2007-03-11 20:54:19
|
Revision: 1226
http://chaos.svn.sourceforge.net/chaos/?rev=1226&view=rev
Author: perlundberg
Date: 2007-03-11 13:54:03 -0700 (Sun, 11 Mar 2007)
Log Message:
-----------
Some minor patches
Modified Paths:
--------------
trunk/chaos-old/libraries/system/system_calls.h
trunk/chaos-old/servers/network/makefile
trunk/chaos-old/storm/generic/system_call.c
trunk/chaos-old/storm/ia32/thread.c
Modified: trunk/chaos-old/libraries/system/system_calls.h
===================================================================
--- trunk/chaos-old/libraries/system/system_calls.h 2007-03-10 21:50:16 UTC (rev 1225)
+++ trunk/chaos-old/libraries/system/system_calls.h 2007-03-11 20:54:03 UTC (rev 1226)
@@ -114,7 +114,7 @@
return return_value;
}
-/* Wait for an IRQ. */
+/* Acknowledge that an IRQ has been raised. */
static inline return_type system_call_irq_acknowledge (unsigned int irq_number)
{
@@ -576,7 +576,7 @@
return return_value;
}
-/* Fork (;) off a new process. */
+/* Fork ( ;) ) off a new process. */
static inline return_type system_call_process_create (process_create_type *process_data)
{
Modified: trunk/chaos-old/servers/network/makefile
===================================================================
--- trunk/chaos-old/servers/network/makefile 2007-03-10 21:50:16 UTC (rev 1225)
+++ trunk/chaos-old/servers/network/makefile 2007-03-11 20:54:03 UTC (rev 1226)
@@ -2,23 +2,9 @@
## Author: Per Lundberg <pl...@ch...>
## Copyright 1999-2000 chaos development.
+## Copyright 2007 chaos development.
-## This program is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-## USA.
-
-SERVERS = 3c509 loopback ipv4 3com-pci realtek-pci # ne2000 tulip via-rhine
+SERVERS = 3c509 loopback ipv4 3com-pci realtek-pci ne2000 # tulip via-rhine
PREFIX = /tftpboot/chaos
.PHONY: all autochaos clean config install tags
Modified: trunk/chaos-old/storm/generic/system_call.c
===================================================================
--- trunk/chaos-old/storm/generic/system_call.c 2007-03-10 21:50:16 UTC (rev 1225)
+++ trunk/chaos-old/storm/generic/system_call.c 2007-03-11 20:54:03 UTC (rev 1226)
@@ -3,22 +3,8 @@
/* Author: Per Lundberg <pl...@ch...> */
/* Copyright 2000 chaos development. */
+/* Copyright 2007 chaos development */
-/* This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA. */
-
/* This file contains a wrapper for each system call function, which
is responsible for locking the right mutex. Also, it serves as an
abstraction layer for the architecture dependent parts of the
Modified: trunk/chaos-old/storm/ia32/thread.c
===================================================================
--- trunk/chaos-old/storm/ia32/thread.c 2007-03-10 21:50:16 UTC (rev 1225)
+++ trunk/chaos-old/storm/ia32/thread.c 2007-03-11 20:54:03 UTC (rev 1226)
@@ -532,7 +532,7 @@
break;
}
- /* Put a process to sleep. */
+ /* Put a thread to sleep. */
case THREAD_SLEEP:
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
