Skip to content

X
xv6-public
提交 ce3ea511 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

Handle reads and writes to T_DEV.

上级 d00a87f6
隐藏空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 11 行删除
console.c
浏览文件 @ ce3ea511
...@@ -7,10 +7,15 @@ ...@@ -7,10 +7,15 @@
#include "cpu.h" #include "cpu.h"
#include "kernel.h" #include "kernel.h"
#include "spinlock.h" #include "spinlock.h"
#include "fs.h"
#include "condvar.h"
#include "file.h"
#include "x86.h" #include "x86.h"
#include <stdarg.h> #include <stdarg.h>
#define BACKSPACE 0x100
static struct { static struct {
struct spinlock lock; struct spinlock lock;
int locking; int locking;
...@@ -42,12 +47,30 @@ printint(void (*putch) (void*, char), void *putarg, ...@@ -42,12 +47,30 @@ printint(void (*putch) (void*, char), void *putarg,
putch(putarg, buf[i]); putch(putarg, buf[i]);
} }
static void
consputc(int c)
{
// XXX(sbw)
#if 0
if(panicked){
cli();
for(;;)
;
}
#endif
if(c == BACKSPACE){
uartputc('\b'); uartputc(' '); uartputc('\b');
} else
uartputc(c);
cgaputc(c);
}
// Print to the console. // Print to the console.
static void static void
writecons(void *arg, char c) writecons(void *arg, char c)
{ {
uartputc(c); consputc(c);
cgaputc(c);
} }
// Only understands %d, %u, %x, %s, %lx. // Only understands %d, %u, %x, %s, %lx.
...@@ -189,10 +212,34 @@ panic(const char *s) ...@@ -189,10 +212,34 @@ panic(const char *s)
; ;
} }
static int
consolewrite(struct inode *ip, char *buf, int n)
{
int i;
iunlock(ip);
acquire(&cons.lock);
for(i = 0; i < n; i++)
consputc(buf[i] & 0xff);
release(&cons.lock);
ilock(ip, 1);
return n;
}
static int
consoleread(struct inode *ip, char *dst, int n)
{
panic("consoleread");
}
void void
initconsole(void) initconsole(void)
{ {
initlock(&cons.lock, "console"); initlock(&cons.lock, "console");
devsw[CONSOLE].write = consolewrite;
devsw[CONSOLE].read = consoleread;
// XXX(sbw) enable once we setup %gs // XXX(sbw) enable once we setup %gs
cons.locking = 0; cons.locking = 0;
} }
file.c
浏览文件 @ ce3ea511
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "file.h" #include "file.h"
#include "stat.h" #include "stat.h"
struct devsw __attribute__ ((aligned (CACHELINE))) devsw[NDEV]; struct devsw __mpalign__ devsw[NDEV];
// Allocate a file structure. // Allocate a file structure.
struct file* struct file*
......
fs.c
浏览文件 @ ce3ea511
...@@ -515,13 +515,9 @@ readi(struct inode *ip, char *dst, u32 off, u32 n) ...@@ -515,13 +515,9 @@ readi(struct inode *ip, char *dst, u32 off, u32 n)
struct buf *bp; struct buf *bp;
if(ip->type == T_DEV){ if(ip->type == T_DEV){
// XXX(sbw)
panic("readi T_DEV");
#if 0
if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].read) if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].read)
return -1; return -1;
return devsw[ip->major].read(ip, dst, n); return devsw[ip->major].read(ip, dst, n);
#endif
} }
if(off > ip->size || off + n < off) if(off > ip->size || off + n < off)
...@@ -547,13 +543,9 @@ writei(struct inode *ip, char *src, u32 off, u32 n) ...@@ -547,13 +543,9 @@ writei(struct inode *ip, char *src, u32 off, u32 n)
struct buf *bp; struct buf *bp;
if(ip->type == T_DEV){ if(ip->type == T_DEV){
// XXX(sbw)
panic("writei T_DEV");
#if 0
if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].write) if(ip->major < 0 || ip->major >= NDEV || !devsw[ip->major].write)
return -1; return -1;
return devsw[ip->major].write(ip, src, n); return devsw[ip->major].write(ip, src, n);
#endif
} }
if(off > ip->size || off + n < off) if(off > ip->size || off + n < off)
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论