qi-hardware/iris
1
0
Fork 0
mirror of git://projects.qi-hardware.com/iris.git synced 2025-04-21 12:27:27 +03:00
Code Activity

bug hunting

Browse Source
This commit is contained in:
Bas Wijnen
2009-12-26 14:17:06 +01:00
parent ad2f531ab0
commit d97f1a4ff2
23 changed files with 334 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
boot-programs/buzzer.ccp
View File

@@ -53,6 +53,7 @@ enum codes:
BUZZER = 32
Kernel::Num start ():
Kernel::schedule ()
map_tcu ()
DevBuzzer buzzer

18
boot-programs/init.ccp
View File

@@ -20,7 +20,7 @@
#include "iris.hh"
static Keyboard sysreq
static Device kbd_dev, buz_dev
static Device kbd_dev, buz_dev, backlight_dev
static unsigned slot
// Event types.
@@ -28,6 +28,7 @@ enum type:
SYSREQ
KBDDEV
BUZDEV
BACKLIGHTDEV
static void user_reply (Kernel::Cap target, unsigned dev):
switch dev:
@@ -91,6 +92,12 @@ static void setup ():
reply.invoke ()
Kernel::free_cap (reply)
break
case Setting::ID:
caps.set (BACKLIGHTDEV, arg.copy ())
backlight_dev = Kernel::Cap (slot, BACKLIGHTDEV)
reply.invoke ()
Kernel::free_cap (reply)
break
default:
kdebug ("unexpected device\n")
break
@@ -106,7 +113,7 @@ static void setup ():
Kernel::free_cap (arg)
continue
Kernel::free_cap (arg)
if ++state == 4:
if ++state == 5:
break
// sysreq
kdebug ("using sysreq\n")
@@ -119,8 +126,13 @@ static void setup ():
Kernel::free_cap (user)
Kernel::Num start ():
Kernel::schedule ()
setup ()
kdebug ("init set up\n")
// claim backlight
kdebug ("claiming backlight\n")
Setting backlight = backlight_dev.create_user (Kernel::Cap ())
backlight_dev.use (backlight)
while true:
Kernel::wait ()
switch Kernel::recv.protected_data.value ():
@@ -129,8 +141,10 @@ Kernel::Num start ():
kdebug ("\n\nSystem request ")
if code & Keyboard::RELEASE:
kdebug ("released.\n\n")
backlight.set (~0)
else:
kdebug ("pressed.\n\n")
backlight.set (0)
break
default:
if Kernel::recv.data[0].l != Parent::GET_DEVICE:

124
boot-programs/lcd.ccp
View File

@@ -28,8 +28,12 @@ extern unsigned char const charset[127-32][6]
#if defined (TRENDTAC)
static unsigned h = 800, v = 480, fps = 60, Bpp = 2
#define LOG_X_BASE 1
#define LOG_Y_BASE 1
#elif defined (NANONOTE)
static unsigned h = 320, v = 240, fps = 60, Bpp = 4
#define LOG_X_BASE 0
#define LOG_Y_BASE 0
#else
#error unknown board
#endif
@@ -200,12 +204,12 @@ static void putchar (unsigned x, unsigned y, unsigned ch, unsigned fg = 0xffff,
for unsigned r = 0; r < 8; ++r:
LCD_FRAMEBUFFER_BASE[(y * 8 + r) * h + x * 6 + k] = lookup[charset[ch][k] & (1 << r) ? 1 : 0]
static unsigned log_x = 1, log_y = 1
static unsigned log_x = LOG_X_BASE, log_y = LOG_Y_BASE
static void inc_logx ():
if ++log_x >= h / 6:
log_x = 1
log_x = LOG_X_BASE
if ++log_y >= v / 8:
log_y = 1
log_y = LOG_Y_BASE
static void log_char (unsigned ch):
switch ch:
@@ -241,10 +245,9 @@ static void log_msg ():
log_char ('\n')
enum captype:
#ifdef TRENDTAC
LOG
#endif
LOG = 32
SET_EOF_CB
BACKLIGHT
static unsigned spot (unsigned x, unsigned y, unsigned cx, unsigned cy):
unsigned dx2 = (x - cx) * (x - cx)
@@ -256,6 +259,7 @@ static unsigned spot (unsigned x, unsigned y, unsigned cx, unsigned cy):
return ((l * l - d2 - 1) << 8) / (l * l)
Kernel::Num start ():
Kernel::schedule ()
map_lcd ()
map_cpm ()
#ifdef NANONOTE
@@ -300,32 +304,118 @@ Kernel::Num start ():
__asm__ volatile ("li $a0, 1\nlw $a1, %0\nbreak" :: "m"(logcap.code): "a0", "a1", "memory")
#endif
// Register the backlight device.
Kernel::Cap backlight = Kernel::my_receiver.create_capability (BACKLIGHT)
Kernel::my_parent.provide_device <Setting> (backlight)
Kernel::Cap eof_cb
bool have_eof = false
bool is_on = true
unsigned backlight_user = 0
Kernel::Num current_backlight = 0
while true:
Kernel::wait ()
//log_msg ()
switch Kernel::recv.protected_data.l:
case IRQ_LCD:
lcd_clr_eof ()
eof_cb.invoke ()
switch Kernel::recv.protected_data.h:
case 0:
switch Kernel::recv.protected_data.l:
case IRQ_LCD:
lcd_clr_eof ()
eof_cb.invoke ()
have_eof = false
Kernel::free_cap (eof_cb)
break
#if defined (TRENDTAC)
case LOG:
log_char (Kernel::recv.data[0].l)
break
#endif
case BACKLIGHT:
switch Kernel::recv.data[0].l:
case Device::CREATE_USER:
Kernel::Cap reply = Kernel::get_reply ()
Kernel::Cap c = Kernel::my_receiver.create_capability (Kernel::Num (backlight_user++, BACKLIGHT))
reply.invoke (0, 0, c.copy ())
Kernel::free_cap (c)
Kernel::free_cap (reply)
break
case Device::DESTROY_USER:
Kernel::recv.reply.invoke ()
break
case Device::USE:
Kernel::Cap reply = Kernel::get_reply ()
Kernel::Cap arg = Kernel::get_arg ()
current_backlight = Kernel::my_receiver.get_protected (arg)
reply.invoke ()
Kernel::free_cap (arg)
Kernel::free_cap (reply)
break
case Device::UNUSE:
Kernel::Cap reply = Kernel::get_reply ()
Kernel::Cap arg = Kernel::get_arg ()
if current_backlight.value () == Kernel::my_receiver.get_protected (arg).value ():
current_backlight = 0
reply.invoke ()
Kernel::free_cap (arg)
Kernel::free_cap (reply)
break
default:
log_char ('@')
break
break
default:
log_char ('#')
log_num (Kernel::recv.protected_data)
log_char ('\n')
break
break
case BACKLIGHT:
if current_backlight.value () != Kernel::recv.protected_data.value ():
log_char ('&')
log_num (current_backlight)
log_num (Kernel::recv.protected_data)
log_char ('\n')
break
switch Kernel::recv.data[0].l:
case Setting::SET:
// TODO
unsigned state = Kernel::recv.data[1].l
if !state:
#if defined (NANONOTE)
if is_on:
write_reg (BACKLIGHT1, 0x5e)
is_on = false
#else
#endif
else:
#if defined (NANONOTE)
if !is_on:
write_reg (BACKLIGHT1, 0x5f)
is_on = true
#else
#endif
Kernel::recv.reply.invoke ()
break
case Setting::GET_RANGE:
Kernel::recv.reply.invoke (~0)
break
default:
log_char ('$')
break
break
case SET_EOF_CB:
Kernel::Cap reply = Kernel::get_reply ()
if have_eof:
Kernel::free_cap (eof_cb)
else:
Kernel::register_interrupt (IRQ_LCD)
have_eof = true
eof_cb = Kernel::get_arg ()
Kernel::Cap reply = Kernel::get_reply ()
Kernel::register_interrupt (IRQ_LCD)
reply.invoke ()
Kernel::free_cap (reply)
break
#ifdef TRENDTAC
case LOG:
log_char (Kernel::recv.data[0].l)
break
#endif
default:
log_char ('~')
log_num (Kernel::recv.protected_data)
log_char ('\n')
break

1
boot-programs/metronome.ccp
View File

@@ -20,6 +20,7 @@
#include "keys.hh"
Kernel::Num start ():
Kernel::schedule ()
kdebug ("metronome started\n")
Buzzer buzzer = Kernel::my_parent.get_device <Buzzer> ()
Keyboard kbd = Kernel::my_parent.get_device <Keyboard> ()

1
boot-programs/nanonote-gpio.ccp
View File

@@ -195,6 +195,7 @@ enum codes:
PWR
Kernel::Num start ():
Kernel::schedule ()
map_gpio ()
DevKbd kbd

137
boot-programs/udc.ccp
View File

@@ -154,6 +154,9 @@ class Udc:
bool vendor (Setup *s)
bool get_descriptor (unsigned type, unsigned idx, unsigned len)
bool handle_setup (Setup *s)
char log_buffer[1000]
unsigned log_buffer_size
unsigned log_buffer_start
public:
void init ()
void log (unsigned c)
@@ -193,6 +196,8 @@ void Udc::init ():
s_langs = (String <1>){ sizeof (String <1>), String <1>::Type, { 0x0409 } }
s_manufacturer = (String <6>){ sizeof (String <6>), String <6>::Type, { 's', 'h', 'e', 'v', 'e', 'k' } }
s_product = (String <16>){ sizeof (String <16>), String <16>::Type, { 'I', 'r', 'i', 's', ' ', 'o', 'n', ' ', 'N', 'a', 'n', 'o', 'N', 'o', 't', 'e' } }
log_buffer_size = 0
log_buffer_start = 0
// Disconnect from the bus and don't try to get high-speed.
UDC_POWER &= ~(UDC_POWER_SOFTCONN | UDC_POWER_HSENAB)
@@ -210,31 +215,41 @@ void Udc::init ():
// enable interrupts on endpoint 0.
UDC_INTRINE |= 1 << 0
UDC_INDEX = 0
// Wait a bit and connect to the host.
Kernel::my_receiver.sleep (10)
// Connect to the host.
UDC_POWER |= UDC_POWER_SOFTCONN
bool Udc::vendor (Setup *s):
if s->request_type & 0x80:
if !(s->request_type & 0x80):
return true
if s->request == 10:
static char b[2]
ptr = b
size = s->length < 2 ? s->length : 2
b[0] = '#'
if log_buffer_start == log_buffer_size:
size = 1
else:
b[1] = log_buffer[log_buffer_start++]
if log_buffer_start == log_buffer_size:
log_buffer_start = 0
log_buffer_size = 0
else:
static char const *name = "Reboot"
ptr = name
size = s->length < 6 ? s->length : 6
state = TX
rebooting = true
return true
state = TX
return true
bool Udc::get_descriptor (unsigned type, unsigned idx, unsigned len):
switch type:
case Configuration::Type:
//kdebug ("config\n")
if idx != 0:
return false
ptr = reinterpret_cast <char const *> (&config_descriptor)
size = (len < sizeof (config_descriptor) ? len : sizeof (config_descriptor))
break
case Device::Type:
//kdebug ("device\n")
if idx != 0:
return false
ptr = reinterpret_cast <char const *> (&device_descriptor)
@@ -249,7 +264,6 @@ bool Udc::get_descriptor (unsigned type, unsigned idx, unsigned len):
return false
// The 6 is an arbitrary number, except that String <6> in instantiated already.
case String <6>::Type:
//kdebug ("string\n")
switch idx:
case 0:
ptr = reinterpret_cast <char const *> (&s_langs)
@@ -272,17 +286,6 @@ bool Udc::get_descriptor (unsigned type, unsigned idx, unsigned len):
return true
bool Udc::handle_setup (Setup *s):
//kdebug ("udc: setup: type=")
//kdebug_num (s->request_type, 2)
//kdebug ("; request=")
//kdebug_num (s->request, 2)
//kdebug ("; value=")
//kdebug_num (s->value, 4)
//kdebug ("; index=")
//kdebug_num (s->index, 4)
//kdebug ("; length=")
//kdebug_num (s->length, 4)
//kdebug ("\n")
switch s->request_type:
case STANDARD_TO_DEVICE:
switch s->request:
@@ -333,7 +336,6 @@ bool Udc::handle_setup (Setup *s):
void Udc::interrupt ():
unsigned i = UDC_INTRUSB
if i & UDC_INTR_RESET:
//kdebug ("udc: reset\n")
state = IDLE
return
i = UDC_INTRIN
@@ -357,24 +359,18 @@ void Udc::interrupt ():
packet.d[1] = UDC_FIFO (0)
UDC_CSR0 = csr | UDC_CSR0_DATAEND | UDC_CSR0_SVDOUTPKTRDY
if !handle_setup (&packet.s):
//kdebug ("stall 1\n")
csr |= UDC_CSR0_SENDSTALL
break
if size == 0:
return
// Fall through.
case TX:
//kdebug ("udc: send next:")
unsigned i
for i = 0; (size & ~3) > 0 && i < max_packet_size0; i += 4, size -= 4:
//for unsigned i = 0; i < 4; ++i:
//kdebug_num (ptr[i], 2)
UDC_FIFO (0) = *(unsigned *)ptr
ptr += 4
for ; size > 0 && i < max_packet_size0; ++i, --size:
//kdebug_num (*ptr, 2)
UDC_FIFO8 (0) = *ptr++
//kdebug ("\n")
if i == max_packet_size0:
csr |= UDC_CSR0_INPKTRDY
else:
@@ -383,19 +379,19 @@ void Udc::interrupt ():
break
case RX:
// Not supported.
//kdebug ("stall 2\n")
csr |= UDC_CSR0_SVDOUTPKTRDY | UDC_CSR0_SENDSTALL
state = IDLE
break
UDC_CSR0 = csr
void Udc::log (unsigned c):
kdebug ("udc: log ")
kdebug_char (c)
kdebug ("\n")
if log_buffer_size >= sizeof (log_buffer):
return
log_buffer[log_buffer_size++] = c
enum pdata:
LOG = 32
FS
Kernel::Num start ():
map_udc ()
@@ -403,20 +399,77 @@ Kernel::Num start ():
map_cpm ()
Udc udc
udc.init ()
Kernel::Cap logcap = Kernel::my_receiver.create_capability (LOG)
__asm__ volatile ("li $a0, 1\nlw $a1, %0\nbreak" :: "m"(logcap.code): "a0", "a1", "memory")
udc.init ()
Kernel::register_interrupt (IRQ_UDC)
Device fs_dev = Kernel::my_receiver.create_capability (FS)
Kernel::my_parent.provide_device <Directory> (fs_dev)
Kernel::Num current_user = 0
unsigned next_user
while true:
Kernel::wait ()
switch Kernel::recv.protected_data.l:
case IRQ_UDC:
udc.interrupt ()
Kernel::register_interrupt (IRQ_UDC)
break
case LOG:
udc.log (Kernel::recv.data[0].l)
break
default:
udc.log ('~')
break
switch Kernel::recv.protected_data.h:
case 0:
switch Kernel::recv.protected_data.l:
case IRQ_UDC:
udc.interrupt ()
Kernel::register_interrupt (IRQ_UDC)
break
case LOG:
udc.log (Kernel::recv.data[0].l)
break
case FS:
switch Kernel::recv.data[0].l:
case Device::CREATE_USER:
Kernel::Cap reply = Kernel::get_reply ()
Kernel::Cap c = Kernel::my_receiver.create_capability (Kernel::Num (next_user++, FS))
reply.invoke (0, 0, c.copy ())
Kernel::free_cap (c)
Kernel::free_cap (reply)
break
case Device::DESTROY_USER:
Kernel::Cap reply = Kernel::get_reply ()
reply.invoke ()
Kernel::free_cap (reply)
break
case Device::USE:
Kernel::Cap reply = Kernel::get_reply ()
Kernel::Cap arg = Kernel::get_arg ()
current_user = Kernel::my_receiver.get_protected (arg)
reply.invoke ()
Kernel::free_cap (reply)
Kernel::free_cap (arg)
break
case Device::UNUSE:
Kernel::Cap reply = Kernel::get_reply ()
Kernel::Cap arg = Kernel::get_arg ()
if current_user.value () == Kernel::my_receiver.get_protected (arg).value ():
current_user = 0
reply.invoke ()
Kernel::free_cap (reply)
Kernel::free_cap (arg)
break
break
default:
udc.log ('~')
char digit[] = "0123456789abcdef"
for unsigned i = 0; i < 8; ++i:
udc.log (digit[(Kernel::recv.protected_data.l >> (4 * (7 - i))) & 0xf])
udc.log ('\n')
break
case FS:
if current_user.value () != Kernel::recv.protected_data.value ():
break
switch Kernel::recv.data[0].l:
case Directory::GET_SIZE:
case Directory::GET_NAME:
case Directory::GET_FILE_RO:
case Directory::LOCK_RO:
case Directory::UNLOCK_RO:
Kernel::recv.reply.invoke ()
break
case Directory::GET_FILE_INFO:
default:
Kernel::recv.reply.invoke (~0)
break