i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved queue initialization into int_init2()

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2016 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2002-11-19 11:53:41 +00:00
parent 9f83f86cbe
commit d55c9bd082
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/int.c
+9 -9
View File
@@ -31,7 +31,6 @@ struct io_vector {
static struct io_vector *io_vectors = NULL; static struct io_vector *io_vectors = NULL;
cpu_status cpu_status
disable_interrupts() disable_interrupts()
{ {
@@ -58,11 +57,17 @@ int_init(kernel_args *ka)
int int
int_init2(kernel_args *ka) int_init2(kernel_args *ka)
{ {
int i;
io_vectors = (struct io_vector *)malloc(sizeof(struct io_vector) * NUM_IO_VECTORS); io_vectors = (struct io_vector *)malloc(sizeof(struct io_vector) * NUM_IO_VECTORS);
if (io_vectors == NULL) if (io_vectors == NULL)
panic("int_init2: could not create io vector table!\n"); panic("int_init2: could not create io vector table!\n");
memset(io_vectors, 0, sizeof(struct io_vector) * NUM_IO_VECTORS); /* initialize the vector list */
for (i = 0; i < NUM_IO_VECTORS; i++) {
io_vectors[i].vector_lock = 0; /* initialize spinlock */
initque(&io_vectors[i].handler_list); /* initialize handler queue */
}
return arch_int_init2(ka); return arch_int_init2(ka);
} }
@@ -100,10 +105,6 @@ install_interrupt_handler(long vector, interrupt_handler handler, void *data)
state = disable_interrupts(); state = disable_interrupts();
acquire_spinlock(&io_vectors[vector].vector_lock); acquire_spinlock(&io_vectors[vector].vector_lock);
/* The list must be inited before the first item is inserted */
if (io_vectors[vector].handler_list.next == NULL)
initque(&io_vectors[vector].handler_list);
insque(io, &io_vectors[vector].handler_list); insque(io, &io_vectors[vector].handler_list);
release_spinlock(&io_vectors[vector].vector_lock); release_spinlock(&io_vectors[vector].vector_lock);
@@ -215,9 +216,8 @@ int_io_interrupt_handler(int vector)
acquire_spinlock(&io_vectors[vector].vector_lock); acquire_spinlock(&io_vectors[vector].vector_lock);
// The list can be empty, or not initialized at this place // The list can be empty at this place
if (io_vectors[vector].handler_list.next == &io_vectors[vector].handler_list if (io_vectors[vector].handler_list.next == &io_vectors[vector].handler_list) {
|| io_vectors[vector].handler_list.next == NULL) {
dprintf("unhandled io interrupt %d\n", vector); dprintf("unhandled io interrupt %d\n", vector);
release_spinlock(&io_vectors[vector].vector_lock); release_spinlock(&io_vectors[vector].vector_lock);
return B_UNHANDLED_INTERRUPT; return B_UNHANDLED_INTERRUPT;