Kernel/UDI - Fix omission of UDI_PCI_VERSION in bus_pci.c

[tpg/acess2.git] / KernelLand / Modules / Interfaces / UDI / trans / bus_pci.c

diff --git a/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c b/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
index 2d7459a..651329d 100644 (file)
--- a/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
+++ b/KernelLand/Modules/Interfaces/UDI/trans/bus_pci.c
@@ -5,7 +5,8 @@
  * trans/bus_pci.c
  * - PCI Bus Driver
  */
-#define DEBUG  1
+#define DEBUG  0
+#define UDI_PCI_VERSION        0x101
 #include <udi.h>
 #include <udi_physio.h>
 #include <udi_pci.h>
@@ -156,6 +157,15 @@ void pci_enumerate_req(udi_enumerate_cb_t *cb, udi_ubit8_t enumeration_level)
                        attr_list ++;
                        DPT_SET_ATTR32(attr_list, "pci_device_id", dev);
                        attr_list ++;
+                       
+                       DPT_SET_ATTR32(attr_list, "pci_baseclass", class >> 16);
+                       attr_list ++;
+                       DPT_SET_ATTR32(attr_list, "pci_base_class", class >> 16);       // E20010702.1
+                       attr_list ++;
+                       DPT_SET_ATTR32(attr_list, "pci_sub_class", (class >> 8) & 0xFF);
+                       attr_list ++;
+                       DPT_SET_ATTR32(attr_list, "pci_prog_if", (class >> 0) & 0xFF);
+                       attr_list ++;
 
                        cb->attr_valid_length = attr_list - cb->attr_list;
                        cb->child_ID = rdata->cur_iter;
@@ -240,7 +250,7 @@ void pci_intr_event_rdy(udi_intr_event_cb_t *cb)
        ASSERTC(context->event_cb_rd_ofs, <, PCI_MAX_EVENT_CBS);
        ASSERTC(context->event_cb_wr_ofs, <, PCI_MAX_EVENT_CBS);
 
-       LOG("Rd %i, Wr %i [WR %p]", context->event_cb_rd_ofs, context->event_cb_wr_ofs, cb);
+       LOG("Rd %i, Wr %i [WR %p{%p}]", context->event_cb_rd_ofs, context->event_cb_wr_ofs, cb, cb->event_buf);
        if( context->event_cbs[context->event_cb_wr_ofs] )
        {
                // oops, overrun.
@@ -259,7 +269,7 @@ void pci_intr_event_rdy(udi_intr_event_cb_t *cb)
 }
 void pci_intr_event_rdy__irqs_enabled(udi_cb_t *gcb, udi_buf_t *newbuf, udi_status_t status, udi_ubit16_t result)
 {
-       // nothing
+       // Do nothing
 }
 
 void pci_intr_handler(int irq, void *void_context)
@@ -283,27 +293,54 @@ void pci_intr_handler(int irq, void *void_context)
        if( context->event_cb_rd_ofs == PCI_MAX_EVENT_CBS )
                context->event_cb_rd_ofs = 0;
        ASSERT(cb);
+       ASSERT(cb->gcb.scratch);
        
        if( UDI_HANDLE_IS_NULL(context->intr_preprocessing, udi_pio_handle_t) )
        {
+               // TODO: Ensure region is an interrupt region
                udi_intr_event_ind(cb, 0);
        }
        else
        {
                // Processing
+               *(udi_ubit8_t*)(cb->gcb.scratch) = 0;
                // - no event info, so mem_ptr=NULL
                udi_pio_trans(pci_intr_handle__trans_done, UDI_GCB(cb),
                        context->intr_preprocessing, 1, cb->event_buf, NULL);
+               // V V V
        }
 }
 
 void pci_intr_handle__trans_done(udi_cb_t *gcb, udi_buf_t *new_buf, udi_status_t status, udi_ubit16_t result)
 {
        udi_intr_event_cb_t *cb = UDI_MCB(gcb, udi_intr_event_cb_t);
+       LOG("cb(%p)->event_buf=%p, new_buf=%p",
+               cb, cb->event_buf, new_buf);
        
+       // TODO: Buffers should not change
+       cb->event_buf = new_buf;
        cb->intr_result = result;
        
-       udi_intr_event_ind(cb, UDI_INTR_PREPROCESSED);  
+       udi_ubit8_t     intr_status = *(udi_ubit8_t*)(gcb->scratch);
+       if( intr_status & UDI_INTR_UNCLAIMED )
+       {
+               // Not claimed, next please.
+               // NOTE: Same as no event in the acess model
+               LOG("Unclaimed");
+               pci_intr_event_rdy(cb);
+       }
+       else if( intr_status & UDI_INTR_NO_EVENT )
+       {
+               // No event should be generated, return cb to pool
+               // EVIL!
+               pci_intr_event_rdy(cb);
+               LOG("No event, return cb to pool");
+       }
+       else
+       {
+               LOG("Inform driver");
+               udi_intr_event_ind(cb, UDI_INTR_PREPROCESSED);  
+       }
 }
 
 // - physio hooks
@@ -384,7 +421,7 @@ udi_primary_init_t  pci_pri_init = {
        .mgmt_ops = &pci_mgmt_ops,
        .mgmt_op_flags = pci_mgmt_op_flags,
        .mgmt_scratch_requirement = 0,
-       .enumeration_attr_list_length = 4,
+       .enumeration_attr_list_length = 7,
        .rdata_size = sizeof(pci_rdata_t),
        .child_data_size = 0,
        .per_parent_paths = 0