Sync net branch with trunk

git-svn-id: svn://kolibrios.org@3405 a494cfbc-eb01-0410-851d-a64ba20cac60
2013-03-23 11:56:23 +00:00
parent 16919a6ad9
commit 372fe91892
9 changed files with 330 additions and 205 deletions
--- a/kernel/branches/net/const.inc
+++ b/kernel/branches/net/const.inc
@@ -568,12 +568,41 @@ ends

 struct  MUTEX
        lhead   LHEAD
-        count   dd ?
-ends
-
-struct  MEM_STATE
-        mutex           MUTEX
-        smallmap        dd ?
+        count   dd ?
+ends
+
+struct  PCIDEV
+        bk              dd ?
+        fd              dd ?
+        vendor_device_id dd ?
+        class           dd ?
+        devfn           db ?
+        bus             db ?
+ends
+
+; The following macro assume that we are on uniprocessor machine.
+; Serious work is needed for multiprocessor machines.
+macro spin_lock_irqsave spinlock
+{
+        pushf
+        cli
+}
+macro spin_unlock_irqrestore spinlock
+{
+        popf
+}
+macro spin_lock_irq spinlock
+{
+        cli
+}
+macro spin_unlock_irq spinlock
+{
+        sti
+}
+
+struct  MEM_STATE
+        mutex           MUTEX
+        smallmap        dd ?
        treemap         dd ?
        topsize         dd ?
        top             dd ?