chore: fix almost *ALL* warnings.

[lunaix-os.git] / lunaix-os / includes / hal / pci.h

diff --git a/lunaix-os/includes/hal/pci.h b/lunaix-os/includes/hal/pci.h
index 21952f2c6a828e22bb2f3e5ac819eafeb4f163a7..b95f89a3c4f935c19b39e3f82299b2046fd74978 100644 (file)
--- a/lunaix-os/includes/hal/pci.h
+++ b/lunaix-os/includes/hal/pci.h
@@ -65,19 +65,19 @@ struct pci_driver;
 
 struct pci_base_addr
 {
 
 struct pci_base_addr
 {

-    uint32_t start;
-    uint32_t size;
-    uint32_t type;
+    u32_t start;
+    u32_t size;
+    u32_t type;

 };
 
 struct pci_device
 {
     struct llist_header dev_chain;
 };
 
 struct pci_device
 {
     struct llist_header dev_chain;

-    uint32_t device_info;
-    uint32_t class_info;
-    uint32_t cspace_base;
-    uint32_t msi_loc;
-    uint16_t intr_info;
+    u32_t device_info;
+    u32_t class_info;
+    u32_t cspace_base;
+    u32_t msi_loc;
+    u16_t intr_info;

     struct
     {
         struct pci_driver* type;
     struct
     {
         struct pci_driver* type;


@@ -101,14 +101,14 @@ struct pci_driver
 //      Refer to "PCI Local Bus Specification, Rev.3, Section 3.2.2.3.2"
 
 static inline pci_reg_t
 //      Refer to "PCI Local Bus Specification, Rev.3, Section 3.2.2.3.2"
 
 static inline pci_reg_t

-pci_read_cspace(uint32_t base, int offset)
+pci_read_cspace(u32_t base, int offset)

 {
     io_outl(PCI_CONFIG_ADDR, base | (offset & ~0x3));
     return io_inl(PCI_CONFIG_DATA);
 }
 
 static inline void
 {
     io_outl(PCI_CONFIG_ADDR, base | (offset & ~0x3));
     return io_inl(PCI_CONFIG_DATA);
 }
 
 static inline void

-pci_write_cspace(uint32_t base, int offset, pci_reg_t data)
+pci_write_cspace(u32_t base, int offset, pci_reg_t data)

 {
     io_outl(PCI_CONFIG_ADDR, base | (offset & ~0x3));
     io_outl(PCI_CONFIG_DATA, data);
 {
     io_outl(PCI_CONFIG_ADDR, base | (offset & ~0x3));
     io_outl(PCI_CONFIG_DATA, data);


@@ -128,7 +128,7 @@ pci_init();
  *
  * @return struct pci_device*
  */
  *
  * @return struct pci_device*
  */

-struct pci_device* pci_get_device_by_class(uint32_t class);
+struct pci_device* pci_get_device_by_class(u32_t class);

 
 /**
  * @brief 根据设备商ID和设备ID，在拓扑中寻找一个设备
 
 /**
  * @brief 根据设备商ID和设备ID，在拓扑中寻找一个设备


@@ -138,7 +138,7 @@ struct pci_device* pci_get_device_by_class(uint32_t class);
  * @return struct pci_device*
  */
 struct pci_device*
  * @return struct pci_device*
  */
 struct pci_device*

-pci_get_device_by_id(uint16_t vendorId, uint16_t deviceId);
+pci_get_device_by_id(u16_t vendorId, u16_t deviceId);

 
 /**
  * @brief 初始化PCI设备的基地址寄存器。返回由该基地址代表的，
 
 /**
  * @brief 初始化PCI设备的基地址寄存器。返回由该基地址代表的，


@@ -151,7 +151,7 @@ pci_get_device_by_id(uint16_t vendorId, uint16_t deviceId);
  * @return size_t
  */
 size_t
  * @return size_t
  */
 size_t

-pci_bar_sizing(struct pci_device* dev, uint32_t* bar_out, uint32_t bar_num);
+pci_bar_sizing(struct pci_device* dev, u32_t* bar_out, u32_t bar_num);

 
 /**
  * @brief 配置并启用设备MSI支持。
 
 /**
  * @brief 配置并启用设备MSI支持。


@@ -174,4 +174,10 @@ pci_add_driver(const char* name,
 int
 pci_bind_driver(struct pci_device* pci_dev);
 
 int
 pci_bind_driver(struct pci_device* pci_dev);
 

+void
+pci_probe_bar_info(struct pci_device* device);
+
+void
+pci_probe_msi_info(struct pci_device* device);
+

 #endif /* __LUNAIX_PCI_H */
 #endif /* __LUNAIX_PCI_H */