Permalink
Browse files

Merge branch 'master' of github.com:amaurybrisou/OwnKernel

Conflicts:
	.svn/wc.db
  • Loading branch information...
2 parents a0d37a5 + abc5b0d commit b4c9d01db43f6d2a33731bfd6aa5767bfc4dab11 amaury committed Dec 21, 2012
Showing with 296 additions and 2,087 deletions.
  1. +0 −1 .svn/entries
  2. +0 −1 .svn/format
  3. +0 −63 .svn/pristine/0c/0ce42fb2eb275ff19677bc6133ec456ed5a66cf8.svn-base
  4. +0 −75 .svn/pristine/21/21a5519f763d59732338ff2e18b64296ed2fda29.svn-base
  5. +0 −11 .svn/pristine/26/2611562be0dd5adf30f333ddd2fa5be1c9123495.svn-base
  6. +0 −26 .svn/pristine/28/2811e6d84e9be5c9d9ce6787cc8a1ce1018fe74b.svn-base
  7. +0 −99 .svn/pristine/28/28281141436209d83eda47c06711fad7fb7a3bdf.svn-base
  8. +0 −12 .svn/pristine/2c/2c9481cde22cd769ca9a0fa22d85807c83269336.svn-base
  9. +0 −188 .svn/pristine/2c/2ca2fd4027a2804eda9ed192762a26642b862ce2.svn-base
  10. +0 −17 .svn/pristine/33/3306fed0d76aa6558db933508d62b4e140c36c55.svn-base
  11. +0 −10 .svn/pristine/3b/3bf05e45079dca88199163a74ad6c00e4626f13b.svn-base
  12. +0 −18 .svn/pristine/3e/3ec13ea9b21b740187a2b39c202d06d9a0093f43.svn-base
  13. +0 −16 .svn/pristine/44/44088cbfb40c5b3937271fd95394c9661baf8165.svn-base
  14. +0 −50 .svn/pristine/49/49306f4ca8468e75e835f3d7e85fa47140482158.svn-base
  15. +0 −6 .svn/pristine/4a/4a6f650b71338c757f7b7b92652f43d4147cfa03.svn-base
  16. +0 −133 .svn/pristine/4d/4d66bc8ba69ac5df3ab8343ac9cf1f25fdffdf16.svn-base
  17. +0 −58 .svn/pristine/50/50ec50d561d5b74ee825259b573e799486237555.svn-base
  18. +0 −8 .svn/pristine/58/58fe8218b6078b1c17a5987cd8257780ae2f3eac.svn-base
  19. +0 −62 .svn/pristine/69/69314a952f85a210783c5f70844d5304f7529873.svn-base
  20. +0 −27 .svn/pristine/70/702361945008eef04bba2ce865aa2dd163e61f50.svn-base
  21. +0 −4 .svn/pristine/74/74c18d3d42a1a6eeca3a374368482808441333db.svn-base
  22. +0 −12 .svn/pristine/75/75ad5ac45acdb80857ad66bc67296d97932ebf02.svn-base
  23. +0 −109 .svn/pristine/78/784ef162e7b994e5368be5c706f26c895ba081d7.svn-base
  24. BIN .svn/pristine/7a/7a09c24f0fc294d48bf062254ad27dcbb531a8df.svn-base
  25. +0 −85 .svn/pristine/7b/7be2f03d6f3c859d3cc4c8f0e7c615555709d452.svn-base
  26. +0 −28 .svn/pristine/83/83fbb7791f1937dd99f8d0a0b7d9f54dd728e23f.svn-base
  27. +0 −71 .svn/pristine/8e/8e8695c4b3dd38b3f7b8870e6ef6c7d329459ce3.svn-base
  28. +0 −6 .svn/pristine/9d/9d24fffba8a922582313157abc977a53141c27b0.svn-base
  29. +0 −8 .svn/pristine/a6/a6a98d4fa734b74ec8e15101990728eab967b782.svn-base
  30. +0 −53 .svn/pristine/b1/b12645e4af51ff9aa48afafbb228d4a213fded84.svn-base
  31. +0 −5 .svn/pristine/b1/b139674e92ac5a39d45651ec79733fb4f7abbe75.svn-base
  32. +0 −17 .svn/pristine/b3/b30cd2d37ea136fef46a7773302bd56c59a201f3.svn-base
  33. +0 −77 .svn/pristine/bb/bb0f4695929a73010bf0838fe6484d3524aa6a67.svn-base
  34. +0 −24 .svn/pristine/be/be6f14118530576dde6d622f5b35d142ba9f8493.svn-base
  35. +0 −57 .svn/pristine/c6/c6e61b17b5612ba5d62c91ba09fe533a218beb1e.svn-base
  36. +0 −9 .svn/pristine/cc/cca8984fecc5ad05a1ef94d8568e99d8bfaa2ac6.svn-base
  37. +0 −9 .svn/pristine/ce/ce2b533508709178ed4b984be5766e3d9aa6099f.svn-base
  38. +0 −47 .svn/pristine/cf/cf2da8a586de5128310ae5b5e54163248e0d5971.svn-base
  39. +0 −20 .svn/pristine/d0/d055a254666ca8b170a1e1c20af7c864a1124f70.svn-base
  40. +0 −44 .svn/pristine/d5/d51b0d5863cf59087b4edf7626f2f05541c30c1b.svn-base
  41. +0 −7 .svn/pristine/d6/d64be56b45c456289b884fad08d516c42ac1ed55.svn-base
  42. +0 −6 .svn/pristine/d9/d90e906509cc192caf6c7058420b9281c3c3c9eb.svn-base
  43. +0 −61 .svn/pristine/dc/dcbbb00e477f2488a9e485a4dce5c4e92880f80f.svn-base
  44. +0 −24 .svn/pristine/df/dfe441cc3fb669e559ca7cbfead402ff7370baf2.svn-base
  45. +0 −113 .svn/pristine/e2/e2154d59293fae97fbba91cb4d05c1297c96c6ad.svn-base
  46. +0 −2 .svn/pristine/e4/e45efb331a3696001eccb80775b36dace22064b0.svn-base
  47. BIN .svn/pristine/ea/eafb2e120a01f32f8c2c1d38e7dadf2a2cecace4.svn-base
  48. +0 −111 .svn/pristine/f0/f01443a24b609c6e16c7c296fb37100741606bc9.svn-base
  49. BIN .svn/wc.db
  50. +0 −22 ENV
  51. +18 −1 README.md
  52. +181 −155 bochsout.txt
  53. +1 −1 bochsrc.txt
  54. BIN floppy.img
  55. +84 −3 nbproject/configurations.xml
  56. +11 −0 nbproject/private/Default.properties
  57. +1 −1 nbproject/private/configurations.xml
  58. +0 −8 svn-commit.2.tmp
  59. +0 −6 svn-commit.tmp
View
@@ -1 +0,0 @@
-12
View
@@ -1 +0,0 @@
-12
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="80">
- <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
- <df name="OwnKernel" root=".">
- <df name="boot">
- <in>bootsect.asm</in>
- </df>
- <df name="kern">
- <df name="lib">
- <in>gdt.h</in>
- <in>idt.h</in>
- <in>io.h</in>
- <in>kbd.h</in>
- <in>malloc.h</in>
- <in>mm.h</in>
- <in>screen.h</in>
- <in>serial.h</in>
- <in>types.h</in>
- </df>
- <in>gdt.c</in>
- <in>idt.c</in>
- <in>int.asm</in>
- <in>interrupt.c</in>
- <in>io.c</in>
- <in>kernel.c</in>
- <in>lib.c</in>
- <in>mm.c</in>
- <in>pic.c</in>
- <in>screen.c</in>
- <in>serial.c</in>
- <in>syscalls.c</in>
- </df>
- </df>
- <logicalFolder name="ExternalFiles"
- displayName="Important Files"
- projectFiles="false"
- kind="IMPORTANT_FILES_FOLDER">
- <itemPath>Makefile</itemPath>
- </logicalFolder>
- </logicalFolder>
- <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
- <sourceRootList>
- <Elem>.</Elem>
- <Elem>kern/lib</Elem>
- </sourceRootList>
- <projectmakefile>Makefile</projectmakefile>
- <confs>
- <conf name="Default" type="0">
- <toolsSet>
- <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
- <compilerSet>default</compilerSet>
- </toolsSet>
- <makefileType>
- <makeTool>
- <buildCommandWorkingDir>.</buildCommandWorkingDir>
- <buildCommand>${MAKE} -f Makefile</buildCommand>
- <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
- <executablePath></executablePath>
- </makeTool>
- </makefileType>
- </conf>
- </confs>
-</configurationDescriptor>
@@ -1,75 +0,0 @@
-#!/bin/bash -x
-
-#
-# Generated - do not edit!
-#
-
-# Macros
-TOP=`pwd`
-CND_PLATFORM=GNU-Linux-x86
-CND_CONF=Default
-CND_DISTDIR=dist
-CND_BUILDDIR=build
-NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
-TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=MissingOutputInProject
-OUTPUT_BASENAME=MissingOutputInProject
-PACKAGE_TOP_DIR=OwnKernel/
-
-# Functions
-function checkReturnCode
-{
- rc=$?
- if [ $rc != 0 ]
- then
- exit $rc
- fi
-}
-function makeDirectory
-# $1 directory path
-# $2 permission (optional)
-{
- mkdir -p "$1"
- checkReturnCode
- if [ "$2" != "" ]
- then
- chmod $2 "$1"
- checkReturnCode
- fi
-}
-function copyFileToTmpDir
-# $1 from-file path
-# $2 to-file path
-# $3 permission
-{
- cp "$1" "$2"
- checkReturnCode
- if [ "$3" != "" ]
- then
- chmod $3 "$2"
- checkReturnCode
- fi
-}
-
-# Setup
-cd "${TOP}"
-mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
-rm -rf ${NBTMPDIR}
-mkdir -p ${NBTMPDIR}
-
-# Copy files and create directories and links
-cd "${TOP}"
-makeDirectory "${NBTMPDIR}/OwnKernel"
-copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
-
-
-# Generate tar file
-cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/OwnKernel.tar
-cd ${NBTMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/OwnKernel.tar *
-checkReturnCode
-
-# Cleanup
-cd "${TOP}"
-rm -rf ${NBTMPDIR}
@@ -1,11 +0,0 @@
-
-/* La fonction memcopy permet de copier n octets de src vers dest.
- * Les adresses sont lineaires.
- */
-void *memcpy(char *dst, char *src, int n)
-{
- char *p = dst;
- while (n--)
- *dst++ = *src++;
- return p;
-}
@@ -1,26 +0,0 @@
-
-
-#define IDTBASE 0x800
-#define IDTSIZE 0xFF
-
-#define INTGATE 0x8E00
-#define TRAPGATE 0xEF00 /* utilise pour faire des appels systemes */
-
-struct idtdesc {
- u16 offset0_15;
- u16 select;
- u16 type;
- u16 offset16_31;
-} __attribute__ ((packed));
-
-
-struct idtr {
- u16 limite;
- u32 base;
-} __attribute__ ((packed));
-
-struct idtr kidtr;
-struct idtdesc kidt[IDTSIZE];
-
-void init_idt_desc(u16 , u32 , u16 , struct idtdesc * );
-void init_idt(void);
@@ -1,99 +0,0 @@
-uchar kbdmap[] = {
- 0x1B, 0x1B, 0x1B, 0x1B, /* esc (0x01) */
- '1', '!', '1', '1',
- '2', '@', '2', '2',
- '3', '#', '3', '3',
- '4', '$', '4', '4',
- '5', '%', '5', '5',
- '6', '^', '6', '6',
- '7', '&', '7', '7',
- '8', '*', '8', '8',
- '9', '(', '9', '9',
- '0', ')', '0', '0',
- '-', '_', '-', '-',
- '=', '+', '=', '=',
- 0x08, 0x08, 0x7F, 0x08, /* backspace */
- 0x09, 0x09, 0x09, 0x09, /* tab */
- 'q', 'Q', 'q', 'q',
- 'w', 'W', 'w', 'w',
- 'e', 'E', 'e', 'e',
- 'r', 'R', 'r', 'r',
- 't', 'T', 't', 't',
- 'y', 'Y', 'y', 'y',
- 'u', 'U', 'u', 'u',
- 'i', 'I', 'i', 'i',
- 'o', 'O', 'o', 'o',
- 'p', 'P', 'p', 'p',
- '[', '{', '[', '[',
- ']', '}', ']', ']',
- 0x0A, 0x0A, 0x0A, 0x0A, /* enter */
- 0xFF, 0xFF, 0xFF, 0xFF, /* ctrl */
- 'a', 'A', 'a', 'a',
- 's', 'S', 's', 's',
- 'd', 'D', 'd', 'd',
- 'f', 'F', 'f', 'f',
- 'g', 'G', 'g', 'g',
- 'h', 'H', 'h', 'h',
- 'j', 'J', 'j', 'j',
- 'k', 'K', 'k', 'k',
- 'l', 'L', 'l', 'l',
- ';', ':', ';', ';',
- 0x27, 0x22, 0x27, 0x27, /* '" */
- '`', '~', '`', '`', /* `~ */
- 0xFF, 0xFF, 0xFF, 0xFF, /* Lshift (0x2a) */
- '\\', '|', '\\', '\\',
- 'z', 'Z', 'z', 'z',
- 'x', 'X', 'x', 'x',
- 'c', 'C', 'c', 'c',
- 'v', 'V', 'v', 'v',
- 'b', 'B', 'b', 'b',
- 'n', 'N', 'n', 'n',
- 'm', 'M', 'm', 'm',
- 0x2C, 0x3C, 0x2C, 0x2C, /* ,< */
- 0x2E, 0x3E, 0x2E, 0x2E, /* .> */
- 0x2F, 0x3F, 0x2F, 0x2F, /* /? */
- 0xFF, 0xFF, 0xFF, 0xFF, /* Rshift (0x36) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x37) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x38) */
- ' ', ' ', ' ', ' ', /* space */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x3a) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x3b) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x3c) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x3d) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x3e) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x3f) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x40) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x41) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x42) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x43) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x44) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x45) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x46) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x47) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x48) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x49) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x4a) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x4b) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x4c) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x4d) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x4e) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x4f) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x50) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x51) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x52) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x53) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x54) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x55) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x56) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x57) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x58) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x59) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x5a) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x5b) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x5c) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x5d) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x5e) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x5f) */
- 0xFF, 0xFF, 0xFF, 0xFF, /* (0x60) */
- 0xFF, 0xFF, 0xFF, 0xFF /* (0x61) */
-};
@@ -1,12 +0,0 @@
-
-#ifndef _I386_TYPE_
-#define _I386_TYPE_
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned char uchar;
-
-#endif
-
-
Oops, something went wrong.

0 comments on commit b4c9d01

Please sign in to comment.