Add IDE/ATA support. Add numbers to keyboard.

ATA/IDE support is still bugged as hell.

Author: levex

drivers/ata.c

@@ -21,11 +21,22 @@ void device_init()
 	_kill();
 }
 
+void device_print_out()
+{
+	for(int i = 0; i < lastid; i++)
+	{
+		//if(!devices[lastid]) return;
+		kprintf("id: %d, unique: %d, %s, %s\n", i, devices[i].unique_id,
+				devices[i].dev_type == DEVICE_CHAR ?"CHAR":"BLOCK", devices[i].name);
+	}
+}
+
 int device_add(device_t* dev)
 {
-	devices[++lastid] = *dev;
+	devices[lastid] = *dev;
 	mprint("Registered Device %s (%d) as Device#%d\n", dev->name, dev->unique_id, lastid);
-	return lastid;
+	lastid++;
+	return lastid-1;
 }
 
 device_t *device_get_by_id(uint32_t id)

drivers/device.c

@@ -7,6 +7,7 @@
 #include "../include/pit.h"
 #include "../include/device.h"
 #include "../include/memory.h"
+#include "../include/levos.h"
 
 #include <stdint.h>
 
@@ -281,7 +282,7 @@ uint8_t* flpy_read_lba(int lba)
 
 }
 
-uint8_t flpy_read(uint8_t* buffer, uint32_t lba, uint32_t sectors)
+uint8_t flpy_read(uint8_t* buffer, uint32_t lba, uint32_t sectors, device_t *dev UNUSED)
 {
 	if(!sectors) return 1;
 	uint32_t sectors_read = 0;
@@ -336,7 +337,7 @@ uint8_t flpy_write_lba(uint8_t *buf, uint32_t lba)
 
 }
 
-uint8_t flpy_write(uint8_t *buffer, uint32_t lba, uint32_t sectors)
+uint8_t flpy_write(uint8_t *buffer, uint32_t lba, uint32_t sectors, device_t *dev UNUSED)
 {
 	if(!sectors) return 0;
 	uint32_t sectors_wrote = 0;

drivers/fdc.c

@@ -72,6 +72,10 @@ enum KEYCODE {
 	M_PRESSED = 0x32,
 	M_RELEASED = 0xB2,
 
+	ZERO_PRESSED = 0x29,
+	ONE_PRESSED = 0x2,
+	NINE_PRESSED = 0xA,
+
 	POINT_PRESSED = 0x34,
 	POINT_RELEASED = 0xB4,
 
@@ -133,6 +137,7 @@ char keyboard_get_key()
 static char* _qwertzuiop = "qwertzuiop"; // 0x10-0x1c
 static char* _asdfghjkl = "asdfghjkl";
 static char* _yxcvbnm = "yxcvbnm";
+static char* _num = "123456789";
 uint8_t keyboard_to_ascii(uint8_t key)
 {
 	//kprintf("key=0x%x\n", key);
@@ -141,6 +146,9 @@ uint8_t keyboard_to_ascii(uint8_t key)
 	if(key == 0xE) return '\r';
 	if(key == POINT_RELEASED) return '.';
 	if(key == SLASH_RELEASED) return '/';
+	if(key == ZERO_PRESSED) return '0';
+	if(key >= ONE_PRESSED && key <= NINE_PRESSED)
+		return _num[key - ONE_PRESSED];
 	if(key >= 0x10 && key <= 0x1C)
 	{
 		return _qwertzuiop[key - 0x10];

drivers/keyboard.c

@@ -16,7 +16,7 @@ void ext2_read_block(uint8_t *buf, uint32_t block, device_t *dev, ext2_priv_data
 {
 	uint32_t sectors_per_block = priv->sectors_per_block;
 	if(!sectors_per_block) sectors_per_block = 1;
-	dev->read(buf, block*sectors_per_block, sectors_per_block);
+	dev->read(buf, block*sectors_per_block, sectors_per_block, dev);
 
 }
 void ext2_read_inode(inode_t *inode_buf, uint32_t inode, device_t *dev, ext2_priv_data *priv)
@@ -212,11 +212,11 @@ uint8_t ext2_probe(device_t *dev)
 		return 0;
 	}
 	uint8_t *buf = (uint8_t *)malloc(512);
-	dev->read(buf, 2, 1);
+	dev->read(buf, 2, 1, dev);
 	superblock_t *sb = (superblock_t *)buf;
 	if(sb->ext2_sig != EXT2_SIGNATURE)
 	{
-		kprintf("Invalid EXT2 signature!\n");
+		kprintf("Invalid EXT2 signature, have: 0x%x!\n", sb->ext2_sig);
 		return 0;
 	}
 	mprint("Valid EXT2 signature!\n");

fda.img

@@ -1,6 +1,91 @@
 #ifndef __ATA_H_
 #define __ATA_H_
 
+#include <stdint.h>
+
+#define ATA_SR_BSY     0x80
+#define ATA_SR_DRDY    0x40
+#define ATA_SR_DF      0x20
+#define ATA_SR_DSC     0x10
+#define ATA_SR_DRQ     0x08
+#define ATA_SR_CORR    0x04
+#define ATA_SR_IDX     0x02
+#define ATA_SR_ERR     0x01
+
+#define ATA_ER_BBK      0x80
+#define ATA_ER_UNC      0x40
+#define ATA_ER_MC       0x20
+#define ATA_ER_IDNF     0x10
+#define ATA_ER_MCR      0x08
+#define ATA_ER_ABRT     0x04
+#define ATA_ER_TK0NF    0x02
+#define ATA_ER_AMNF     0x01
+
+#define ATA_CMD_READ_PIO          0x20
+#define ATA_CMD_READ_PIO_EXT      0x24
+#define ATA_CMD_READ_DMA          0xC8
+#define ATA_CMD_READ_DMA_EXT      0x25
+#define ATA_CMD_WRITE_PIO         0x30
+#define ATA_CMD_WRITE_PIO_EXT     0x34
+#define ATA_CMD_WRITE_DMA         0xCA
+#define ATA_CMD_WRITE_DMA_EXT     0x35
+#define ATA_CMD_CACHE_FLUSH       0xE7
+#define ATA_CMD_CACHE_FLUSH_EXT   0xEA
+#define ATA_CMD_PACKET            0xA0
+#define ATA_CMD_IDENTIFY_PACKET   0xA1
+#define ATA_CMD_IDENTIFY          0xEC
+
+#define      ATAPI_CMD_READ       0xA8
+#define      ATAPI_CMD_EJECT      0x1B
+
+#define ATA_IDENT_DEVICETYPE   0
+#define ATA_IDENT_CYLINDERS    2
+#define ATA_IDENT_HEADS        6
+#define ATA_IDENT_SECTORS      12
+#define ATA_IDENT_SERIAL       20
+#define ATA_IDENT_MODEL        54
+#define ATA_IDENT_CAPABILITIES 98
+#define ATA_IDENT_FIELDVALID   106
+#define ATA_IDENT_MAX_LBA      120
+#define ATA_IDENT_COMMANDSETS  164
+#define ATA_IDENT_MAX_LBA_EXT  200
+
+#define IDE_ATA        0x00
+#define IDE_ATAPI      0x01
+ 
+#define ATA_MASTER     0x00
+#define ATA_SLAVE      0x01
+
+#define ATA_REG_DATA       0x00
+#define ATA_REG_ERROR      0x01
+#define ATA_REG_FEATURES   0x01
+#define ATA_REG_SECCOUNT0  0x02
+#define ATA_REG_LBA0       0x03
+#define ATA_REG_LBA1       0x04
+#define ATA_REG_LBA2       0x05
+#define ATA_REG_HDDEVSEL   0x06
+#define ATA_REG_COMMAND    0x07
+#define ATA_REG_STATUS     0x07
+#define ATA_REG_SECCOUNT1  0x08
+#define ATA_REG_LBA3       0x09
+#define ATA_REG_LBA4       0x0A
+#define ATA_REG_LBA5       0x0B
+#define ATA_REG_CONTROL    0x0C
+#define ATA_REG_ALTSTATUS  0x0C
+#define ATA_REG_DEVADDRESS 0x0D
+
+// Channels:
+#define      ATA_PRIMARY      0x00
+#define      ATA_SECONDARY    0x01
+ 
+// Directions:
+#define      ATA_READ      0x00
+#define      ATA_WRITE     0x013
+
+typedef struct {
+	uint8_t drive;
+} ide_private_data;
+
 extern void ata_init();
 
 #endif

fs/ext2/ext2.c

@@ -18,10 +18,12 @@ typedef struct __device_t {
 	uint32_t unique_id;
 	device_type dev_type;
 	struct __fs_t *fs;
-	uint8_t (*read)(uint8_t* buffer, uint32_t offset , uint32_t len);
-	uint8_t (*write)(uint8_t *buffer, uint32_t offset, uint32_t len);
+	uint8_t (*read)(uint8_t* buffer, uint32_t offset , uint32_t len, void* dev);
+	uint8_t (*write)(uint8_t *buffer, uint32_t offset, uint32_t len, void* dev);
+	void *priv;
 } device_t;
 
+extern void device_print_out();
 
 extern void device_init();
 extern int device_add(device_t* dev);

hda.img

@@ -24,8 +24,7 @@
 
 #define START(name, addr) addProcess(createProcess(name, (uint32_t)addr));
 
-#define START_AND_WAIT(name, addr) int __pid_name = START(name, addr); \
-				while(is_pid_running(__pid_name))schedule_noirq();
+#define START_AND_WAIT(NAME, ADDR) int ADDR ## _______pid = START(NAME, ADDR);while(is_pid_running(ADDR ## _______pid))schedule_noirq();
 
 extern void hal_init();
 
@@ -34,5 +33,9 @@ extern void send_eoi(uint8_t irq);
 extern void set_int(int i, uint32_t addr);
 
 extern uint8_t inportb(uint16_t portid);
+extern uint16_t inportw(uint16_t portid);
 extern void outportb(uint16_t portid, uint8_t value);
+
+#define insl(port, buffer, count) asm volatile("cld; rep; insl" :: "D" (buffer), "d" (port), "c" (count))
+
 #endif

include/ata.h

@@ -9,6 +9,8 @@ typedef char* string;
 extern size_t strlen(const string str);
 extern size_t strcmp(const string str1, const string str2);
 
+extern void atoi(char *str, int* a);
+
 extern size_t strcrl(string str, const char what, const char with);
 extern size_t str_begins_with(const string str, const string with);
 extern size_t str_backspace(string str, char c);

include/device.h

@@ -30,6 +30,12 @@ uint8_t inportb(uint16_t portid)
 	asm volatile("inb %%dx, %%al":"=a"(ret):"d"(portid));
 	return ret;
 }
+uint16_t inportw(uint16_t portid)
+{
+	uint16_t ret;
+	asm volatile("inw %%dx, %%ax":"=a"(ret):"d"(portid));
+	return ret;
+}
 void outportb(uint16_t portid, uint8_t value)
 {
 	asm volatile("outb %%al, %%dx": :"d" (portid), "a" (value));

include/hal.h

@@ -13,6 +13,17 @@ size_t strlen(const string str)
 	return i;
 }
 
+void atoi(char *str, int* a)
+{
+	int k = 0;
+	while(*str)
+	{
+		k = (k<<3)+(k<<1)+(*str)-'0';
+		str++;
+	}
+	*a = k;
+}
+
 size_t strcrl(string str, const char what, const char with)
 {
 	size_t i = 0;

include/string.h

@@ -115,7 +115,7 @@ void __cursor_updater()
 	_kill();
 }
 
-void test_device_read(uint8_t* buffer, uint32_t offset UNUSED, uint32_t len)
+void test_device_read(uint8_t* buffer, uint32_t offset UNUSED, uint32_t len, device_t *dev UNUSED)
 {
 	len --;
 	while(len--)
@@ -149,7 +149,7 @@ void create_test_device()
 	testdev->name = "/dev/levex";
 	testdev->unique_id = 0x1337;
 	testdev->dev_type = DEVICE_CHAR;
-	testdev->read = (uint8_t(*)(uint8_t*, uint32_t, uint32_t))test_device_read;
+	testdev->read = (uint8_t(*)(uint8_t*, uint32_t, uint32_t, device_t*))test_device_read;
 	levex_id = device_add(testdev);
 	_kill();
 }
@@ -158,7 +158,7 @@ void __read()
 {
 	uint8_t* buffer = (uint8_t*)malloc(32);
 	device_t *testdev = device_get(levex_id);
-	testdev->read(buffer, 0, 32);
+	testdev->read(buffer, 0, 32, testdev);
 	kprintf("%s\n", buffer);
 	_kill();
 }
@@ -228,7 +228,6 @@ void kernel_main()
 	panic("Reached end of main(), but tasking was not started.");
 	for(;;);
 }
-
 /* This function is ought to setup peripherials and such,
  * while also starting somekind of /bin/sh
  */
@@ -246,7 +245,7 @@ void late_init()
 	pid = START("testdev", create_test_device);
 	pid = START("elf_init", elf_init);
 	pid = START("rtc_init", rtc_init);
-	pid = START("ata_init", ata_init);
+	START_AND_WAIT("ata_init", ata_init);
 	pid = START("fdc_init", fdc_init);
 
 	/* We now wait till all the late_inits have finished */
@@ -437,15 +436,33 @@ void _test()
 					prompt_size = strlen(username) + strlen(hostname) + 4 + strlen(wd);
 				}
 			}
+			if(strcmp(buffer, "devinfo") == 0)
+			{
+				device_print_out();
+			}
 			if(strcmp(buffer, "fl") == 0)
 			{
-				device_t *dev = device_get_by_id(19);
+				if(!n || n == 1)
+				{
+					kprintf("FATAL: No id parameter, select root with devinfo\n");
+					goto prompt;
+				}
+				char *arg = (char *)(buffer + strlen(buffer) + 1);
+				int devid = 0;
+				atoi(arg, &devid);
+				kprintf("arg: %d\n", devid);
+				device_t *dev = device_get(devid);
+				if(!dev) {
+					kprintf("Unable to locate medium!\n");
+					goto prompt;
+				}
 				if(device_try_to_mount(dev, "/")) {
 					kprintf("Mounted / on %s (%d) with %s\n", dev->name, dev->unique_id, dev->fs->name);
 					root_mounted = 1;
 					wd = (char *)malloc(512);
 					memcpy(wd, "/", 2);
 					prompt_size = strlen(username) + strlen(hostname) + 4 + strlen(wd);
+					//device_try_to_mount(device_get_by_id(32), "/mnt/");
 					START_AND_WAIT("proc_init", proc_init);
 				}
 				else kprintf("Unable to mount / on %s (%d)!\n", dev->name, dev->unique_id);
@@ -459,7 +476,7 @@ void _test()
 				memset(write_buf, 0, 512);
 				write_buf[0] = 0x37;
 				write_buf[1] = 0x13;
-				dev->write(write_buf, 0, 1);
+				dev->write(write_buf, 0, 1, dev);
 				kprintf("Wrote 0x1337 to first two bytes of the floppy.\n");
 			}
 			if(strcmp(buffer, "lev") == 0)

kernel/hal.c

@@ -7,11 +7,12 @@ CFLAGS=-std=gnu99 -ffreestanding -O2 -Wall -Wextra
 
 mount:
 	echo "Mounting fda.img as /mnt/floppy..."
+	sudo mount -o loop hda.img /mnt/hda
 	sudo mount -o loop fda.img /mnt/floppy
 	echo "Done."
 
 start:
-	qemu -kernel levos.bin -fda fda.img -monitor /dev/stdout
+	qemu -kernel levos.bin -fda fda.img -hda hda.img -monitor /dev/stdout
 	reset
 
 assembly: