Index: kernel/generic/include/ddi/device.h
===================================================================
--- kernel/generic/include/ddi/device.h	(revision e9d15d9f0efb393d698245b131a15268dc1cd68f)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/*
- * Copyright (c) 2006 Jakub Jermar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup genericddi
- * @{
- */
-/** @file
- */
-
-#ifndef KERN_DEVICE_H_
-#define KERN_DEVICE_H_
-
-#include <typedefs.h>
-
-extern devno_t device_assign_devno(void);
-extern sysarg_t sys_device_assign_devno(void);
-
-#endif
-
-/** @}
- */
Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision e9d15d9f0efb393d698245b131a15268dc1cd68f)
+++ kernel/generic/include/ddi/irq.h	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -43,4 +43,14 @@
 #include <proc/task.h>
 #include <ipc/ipc.h>
+
+typedef enum {
+	IRQ_HT_KEY_INR,
+	IRQ_HT_KEY_MODE
+} irq_ht_key_t;
+
+typedef enum {
+	IRQ_HT_MODE_CLAIM,
+	IRQ_HT_MODE_NO_CLAIM
+} irq_ht_mode_t;
 
 typedef enum {
@@ -91,6 +101,5 @@
  *
  * If one device has multiple interrupts, there will be multiple irq_t
- * instantions with the same devno.
- *
+ * instantions.
  */
 typedef struct irq {
@@ -112,7 +121,4 @@
 	 */
 	bool preack;
-	
-	/** Unique device number. -1 if not yet assigned. */
-	devno_t devno;
 	
 	/** Actual IRQ number. -1 if not yet assigned. */
Index: kernel/generic/include/ipc/irq.h
===================================================================
--- kernel/generic/include/ipc/irq.h	(revision e9d15d9f0efb393d698245b131a15268dc1cd68f)
+++ kernel/generic/include/ipc/irq.h	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -47,10 +47,9 @@
 #include <adt/list.h>
 
-extern int ipc_irq_subscribe(answerbox_t *, inr_t, devno_t, sysarg_t,
-    irq_code_t *);
 
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);
 extern void ipc_irq_top_half_handler(irq_t *);
 
+extern int ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *);
 extern int ipc_irq_unsubscribe(answerbox_t *, int);
 extern void ipc_irq_cleanup(answerbox_t *);
Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision e9d15d9f0efb393d698245b131a15268dc1cd68f)
+++ kernel/generic/include/ipc/sysipc.h	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -56,5 +56,5 @@
 extern sysarg_t sys_ipc_hangup(sysarg_t);
 
-extern sysarg_t sys_ipc_irq_subscribe(inr_t, devno_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *);
 extern sysarg_t sys_ipc_irq_unsubscribe(sysarg_t);
 
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision e9d15d9f0efb393d698245b131a15268dc1cd68f)
+++ kernel/generic/include/typedefs.h	(revision e7c4115de0a5bf1dd17b4e273352cc4607d67e03)
@@ -49,5 +49,4 @@
 
 typedef int32_t inr_t;
-typedef int32_t devno_t;
 
 typedef volatile uint8_t ioport8_t;