Fixed bug

svn path=/trunk/; revision=131

diff --git a/reactos/README b/reactos/README
index 1df8492..9accce1 100644 (file)
--- a/reactos/README
+++ b/reactos/README
@@ -1,62 +1,21 @@
-Last updated 30/09/98
-
--- Compiling
-
-Type 'make' to build the kernel on linux using a djgpp cross compiler, or
-'make -fmakefile.dos' to build the kernel from dos using djgpp. No other 
-configuration are supported at the moment, sorry.
-
--- Running
-
-To run the kernel start from a clean dos system (no emm386 or windows) and
-run 'boot.bat'. The kernel should boot, print diagnostic messages and begin
-executing a simple user-mode shell. By default the kernel boots with a
-minimum set of drivers but additional ones can be specified as the arguments
-to 'boot.bat'.
-
--- Problems
-
-This is strictly alpha quality software so expect plenty of those. If you
-are submitting a bug report, please see the section below. If you have a fix 
-for the problem, even better, please send all patches, fixes, enhancements etc 
-to me (David Welch), our coordinator Dennis Winkley or the kernel mailing
-list. (See contact addresses below)
-
--- Bug Reports
-
-Thank you for taking the time to do this, we can only fix the bugs we know
-about, however please include as much information as possible. Say what you
-were trying to do at the time, what messages (if any) were displayed. If the
-kernel crashed, it should print a message like this
-
-     Exception s(r)
-     CS:EIP    p(q)
-     DS xxxxx ES xxxx FS xxxx
-     ...
-     Frames: xxxxx xxxxx xxxxx
-
-Please include the exception type and error code (s and r). The eip 
-address (q) is specific to your kernel, to be of use in fixing the problem
-it needs to be translated to a function name. Do this by running
-
-      nm --numeric-sort kimage > kernel.sym
-
-kernel.sym should include a list of functions and their address, look for the
-last function with an address less than the eip value. The functions should
-sorted in ascending order by address.
-
-If you suspect the problem is hardware related also include details of what
-hardware devices you have installed.  
-
--- Contact addresses
-
-Overall coordinator, Jason Filby (jasonfilby@yahoo.com)
-Kernel coordinator, Dennis Winkley (dwinkley@mail.whitworth.edu)
-Me, David Welch (welch@mcmail.com)
-
-Specific components will probably have contact details for the authors in
-the source file, a partial list of those working on the kernel can be found
-on the kernel website. 
-
--- Additional documentation
-
+DIRECTORIES
+
+system           : compiled versions of the various system components and
+                   libraries
+ntoskrnl          : microkernel source
+ntoskrnl/hal      : hardware abstraction layer source
+ntoskrnl/mm       : memory managment subsystem source
+ntoskrnl/io      : IO manager subsystem source
+include          : win32 headers
+include/internal : kernel private header files
+include/ntdll    : system library private header files
+include/kernel32 : system library private header files
+include/user32   : user interface private header files
+include/gdi32    : graphics interface private header files
+include/ddk      : header files for modules
+lib/ntdll        : NT dll source
+lib/kernel32     : kernel32 source
+doc              : documentation
+loaders/dos      : DOS based loader
+loaders/boot     : boot loader
+services         : various services (device drivers, filesystems etc)

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
new file mode 100644 (file)
index 0000000..4cc10a9
--- /dev/null
+++ b/reactos/ntoskrnl/cc/view.c
@@ -0,0 +1,89 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/cc/view.c
+ * PURPOSE:         Cache manager
+ * PROGRAMMER:      David Welch (welch@mcmail.com)
+ * UPDATE HISTORY:
+ *                  Created 22/05/98
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ddk/ntddk.h>
+#include <ddk/ntifs.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+/* TYPES *********************************************************************/
+
+typedef struct _CACHE_SEGMENT
+{
+   ULONG Type;
+   ULONG Size;
+   LIST_ENTRY ListEntry;
+   PVOID BaseAddress;
+   ULONG Length;
+   ULONG State;
+   MEMORY_AREA* MemoryArea;
+   ULONG FileOffset;
+   ULONG InternalOffset;
+} CACHE_SEGMENT, *PCACHE_SEGMENT;
+
+typedef struct _CC1_CCB
+{
+   ULONG Type;
+   ULONG Size;
+   LIST_ENTRY CacheSegmentListHead;
+   LIST_ENTRY ListEntry;
+} CC1_CCB, PCC1_CCB;
+
+/* FUNCTIONS *****************************************************************/
+
+PVOID Cc1FlushView(PFILE_OBJECT FileObject,
+                  ULONG FileOffset,
+                  ULONG Length)
+{
+}
+
+PVOID Cc1PurgeView(PFILE_OBJECT FileObject,
+                  ULONG FileOffset,
+                  ULONG Length)
+{
+}
+
+VOID Cc1ViewIsUpdated(PFILE_OBJECT FileObject,
+                     ULONG FileOffset)
+{
+}
+
+typedef 
+
+BOOLEAN Cc1RequestView(PFILE_OBJECT FileObject,
+                      ULONG FileOffset,
+                      ULONG Length,
+                      BOOLEAN Wait,
+                      BOOLEAN AcquireForWrite)
+/*
+ * FUNCTION: Request a view for caching data
+ * ARGUMENTS:
+ *          FileObject = File to have information cached in the view
+ *          FileOffset = Offset within the file of the cached information
+ *          Length = Length of the information to be cached
+ *          Wait = If the view is being created then wait for the creater
+ *                 to make the view valid
+ *          AcquireForWrite = True if the view is being acquired for writing
+ *          Buffer = Pointer to a variable to hold the base address of the view
+ * RETURNS: True if the view contains valid data,
+ *          False otherwise
+ */
+{
+}
+
+BOOLEAN Cc1InitializeFileCache(PFILE_OBJECT FileObject)
+/*
+ * FUNCTION: Initialize caching for a file
+ */
+{
+}

diff --git a/reactos/ntoskrnl/hal/x86/printk.c b/reactos/ntoskrnl/hal/x86/printk.c
index 8f79199..9142f8d 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/printk.c
+++ b/reactos/ntoskrnl/hal/x86/printk.c
@@ -16,7 +16,7 @@
 #include <internal/mmhal.h>
 #include <internal/halio.h>
 
 #include <internal/mmhal.h>
 #include <internal/halio.h>
 

-#define BOCHS_DEBUGGING 1
+//#define BOCHS_DEBUGGING 1

 //#define SERIAL_DEBUGGING
 #define SERIAL_PORT 0x03f8
 #define SERIAL_BAUD_RATE 19200
 //#define SERIAL_DEBUGGING
 #define SERIAL_PORT 0x03f8
 #define SERIAL_BAUD_RATE 19200

diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index f470c28..77c6d05 100644 (file)
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -127,7 +127,7 @@ asmlinkage void _main(boot_param* _bp)
    /*
     * Initalize the console (before printing anything)
     */
    /*
     * Initalize the console (before printing anything)
     */

-   HalInitConsole(&_bp);
+   HalInitConsole(&bp);

    
    DbgPrint("Starting ReactOS "KERNEL_VERSION"\n");
 
    
    DbgPrint("Starting ReactOS "KERNEL_VERSION"\n");