ISADMA moved out to a module

diff --git a/Modules/Input/PS2KbMouse/main.c b/Modules/Input/PS2KbMouse/main.c
index 179bbb1..353befb 100644 (file)
--- a/Modules/Input/PS2KbMouse/main.c
+++ b/Modules/Input/PS2KbMouse/main.c
@@ -15,11 +15,12 @@ extern int  Mouse_Install(char **Arguments);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0100, Input_PS2KbMouse, PS2_Install, NULL, NULL);
+MODULE_DEFINE(0, 0x0100, PS2Keyboard, KB_Install, NULL, NULL);
 
 // === CODE ===
 int PS2_Install(char **Arguments)
 {
-       KB_Install(Arguments);
+//     KB_Install(Arguments);
 //     Mouse_Install(Arguments);
        return MODULE_ERR_OK;
 }

diff --git a/Modules/x86/ISADMA/Makefile b/Modules/x86/ISADMA/Makefile
new file mode 100644 (file)
index 0000000..b74c63f
--- /dev/null
+++ b/Modules/x86/ISADMA/Makefile
@@ -0,0 +1,7 @@
+#
+#
+
+OBJ := dma.o
+NAME := ISADMA
+
+-include ../Makefile.tpl

diff --git a/Modules/x86/ISADMA/dma.c b/Modules/x86/ISADMA/dma.c
new file mode 100644 (file)
index 0000000..7b388a7
--- /dev/null
+++ b/Modules/x86/ISADMA/dma.c
@@ -0,0 +1,124 @@
+/*\r
+ * AcessOS 1.0\r
+ * DMA Driver\r
+ */\r
+#include <acess.h>\r
+#include <modules.h>\r
+\r
+#define DMA_SIZE       (0x2400)\r
+#define DMA_ADDRESS(c) ((c)*DMA_SIZE+0x500)    //Save Space for IDT and BDA\r
+\r
+#define LOWB(x)        ((x)&0xFF)\r
+#define HIB(x) (((x)>>8)&0xFF)\r
+#define HIW(x) (((x)>>16)&0xFFFF)\r
+\r
+// === TYPES ===\r
+typedef struct\r
+{\r
+        int    mode;\r
+       char    *address;\r
+} t_dmaChannel;\r
+\r
+// === PROTOTYPES ===\r
+ int   DMA_Install(char **Arguments);\r
+void   DMA_SetChannel(int Channel, int length, int read);\r
+ int   DMA_ReadData(int channel, int count, void *buffer);\r
+ int   DMA_WriteData(int channel, int count, const void *buffer);\r
+\r
+// === CONSTANTS ===\r
+const Uint8 cMASKPORT [8] = { 0x0A, 0x0A, 0x0A, 0x0A, 0xD4, 0xD4, 0xD4, 0xD4 };\r
+const Uint8 cMODEPORT [8] = { 0x0B, 0x0B, 0x0B, 0x0B, 0xD6, 0xD6, 0xD6, 0xD6 };\r
+const Uint8 cCLEARPORT[8] = { 0x0C, 0x0C, 0x0C, 0x0C, 0xD8, 0xD8, 0xD8, 0xD8 };\r
+const Uint8 cPAGEPORT [8] = { 0x87, 0x83, 0x81, 0x82, 0x8F, 0x8B, 0x89, 0x8A };\r
+const Uint8 cADDRPORT [8] = { 0x00, 0x02, 0x04, 0x06, 0xC0, 0xC4, 0xC8, 0xCC };\r
+const Uint8 cCOUNTPORT[8] = { 0x01, 0x03, 0x05, 0x07, 0xC2, 0xC6, 0xCA, 0xCE };\r
+\r
+// === GLOBALS ===\r
+MODULE_DEFINE(0, 0x0100, x86_ISADMA, DMA_Install, NULL, NULL);\r
+char   *dma_addresses[8];\r
+t_dmaChannel   dma_channels[8];\r
+\r
+// === CODE ===\r
+/**\r
+ * \brief Initialise DMA channels\r
+ * \param Arguments    Arguments passed at boot time\r
+ */\r
+int DMA_Install(char **Arguments)\r
+{\r
+       Uint    i;\r
+       for(i=8;i--;)\r
+       {\r
+               outb( cMASKPORT[i], 0x04 | (i & 0x3) ); // mask channel\r
+               outb( cCLEARPORT[i], 0x00 );\r
+               outb( cMODEPORT[i], 0x48 | (i & 0x3) ); //Read Flag\r
+               outb( 0xd8, 0xff);      //Reset Flip-Flop\r
+               outb( cADDRPORT[i], LOWB(DMA_ADDRESS(i)) );     // send address\r
+               outb( cADDRPORT[i], HIB(DMA_ADDRESS(i)) );      // send address\r
+               outb( 0xd8, 0xff);      //Reset Flip-Flop\r
+               outb( cCOUNTPORT[i], LOWB(DMA_SIZE) );      // send size\r
+               outb( cCOUNTPORT[i], HIB(DMA_SIZE) );       // send size\r
+               outb( cPAGEPORT[i], LOWB(HIW(DMA_ADDRESS(i))) );        // send page\r
+               outb( cMASKPORT[i], i & 0x3 );              // unmask channel\r
+               \r
+               dma_channels[i].mode = 0;\r
+               dma_addresses[i] = (char*)DMA_ADDRESS(i);\r
+               dma_addresses[i] += KERNEL_BASE;\r
+       }\r
+       return MODULE_ERR_OK;\r
+}\r
+\r
+/**\r
+ * \fn void DMA_SetChannel(int Channel, int length, int read)\r
+ * \brief Set DMA Channel Length and RW\r
+ */\r
+void DMA_SetChannel(int Channel, int length, int read)\r
+{\r
+       Uint    chan = Channel & 7;\r
+       read = !!read;\r
+       if(length > DMA_SIZE)   length = DMA_SIZE;\r
+       length --;      //Adjust for DMA\r
+       //__asm__ __volatile__ ("cli");\r
+       outb( cMASKPORT[chan], 0x04 | (chan & 0x3) );           // mask channel\r
+       outb( cCLEARPORT[chan], 0x00 );\r
+       outb( cMODEPORT[chan], (0x44 + (!read)*4) | (chan & 0x3) );\r
+       outb( cADDRPORT[chan], LOWB(DMA_ADDRESS(chan)) );               // send address\r
+       outb( cADDRPORT[chan], HIB(DMA_ADDRESS(chan)) );                // send address\r
+       outb( cPAGEPORT[chan], HIW(DMA_ADDRESS(chan)) );                // send page\r
+       outb( cCOUNTPORT[chan], LOWB(length) );      // send size\r
+       outb( cCOUNTPORT[chan], HIB(length) );       // send size\r
+       outb( cMASKPORT[chan], chan & 0x3 );              // unmask channel\r
+       dma_addresses[chan] = (char*)DMA_ADDRESS(chan);\r
+       dma_addresses[chan] += KERNEL_BASE;\r
+       //__asm__ __volatile__ ("sti");\r
+}\r
+\r
+/**\r
+ * \fn void DMA_ReadData(int channel, int count, void *buffer)\r
+ * \brief Read data from a DMA buffer\r
+ */\r
+int DMA_ReadData(int channel, int count, void *buffer)\r
+{\r
+       if(channel < 0 || channel > 7)\r
+               return -1;\r
+       if(count < 0 || count > DMA_SIZE)\r
+               return -2;\r
+       //LogF("memcpy(*0x%x, dma_channels[channel].address, count)\n", buffer\r
+       memcpy(buffer, dma_addresses[channel], count);\r
+       return 0;\r
+}\r
+\r
+/**\r
+ * \fn void DMA_WriteData(int channel, int count, void *buffer)\r
+ * \brief Write data to a DMA buffer\r
+ */\r
+int DMA_WriteData(int channel, int count, const void *buffer)\r
+{\r
+       if(channel < 0 || channel > 7)\r
+               return -1;\r
+       if(count < 0 || count > DMA_SIZE)\r
+               return -2;\r
+       \r
+       memcpy(dma_addresses[channel], buffer, count);\r
+       \r
+       return 0;\r
+}\r

diff --git a/Modules/x86/Makefile.tpl b/Modules/x86/Makefile.tpl
new file mode 100644 (file)
index 0000000..61b234f
--- /dev/null
+++ b/Modules/x86/Makefile.tpl
@@ -0,0 +1,3 @@
+CATEGORY = x86
+
+-include ../../Makefile.tpl