Changes in uspace/drv/nic/rtl8169/driver.c [17651f8:dd8ab1c] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/nic/rtl8169/driver.c
r17651f8 rdd8ab1c 28 28 29 29 #include <assert.h> 30 #include <async.h> 30 31 #include <errno.h> 32 #include <str_error.h> 31 33 #include <align.h> 32 34 #include <byteorder.h> … … 34 36 35 37 #include <as.h> 36 #include <thread.h>37 38 #include <ddf/log.h> 38 39 #include <ddf/interrupt.h> … … 72 73 static int rtl8169_on_stopped(nic_t *nic_data); 73 74 static void rtl8169_send_frame(nic_t *nic_data, void *data, size_t size); 74 static void rtl8169_irq_handler(ipc_callid_t iid, ipc_call_t *icall, 75 ddf_dev_t *dev); 76 static inline int rtl8169_register_int_handler(nic_t *nic_data); 75 static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev); 76 static inline int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle); 77 77 static inline void rtl8169_get_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr); 78 78 static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, const nic_address_t *addr); … … 360 360 } 361 361 362 inline static int rtl8169_register_int_handler(nic_t *nic_data )362 inline static int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle) 363 363 { 364 364 rtl8169_t *rtl8169 = nic_get_specific(nic_data); … … 368 368 rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR; 369 369 rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR; 370 int irq_cap= register_interrupt_handler(nic_get_ddf_dev(nic_data),371 rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code );372 373 return irq_cap;370 int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data), 371 rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle); 372 373 return rc; 374 374 } 375 375 … … 428 428 goto err_pio; 429 429 430 int irq_cap = rtl8169_register_int_handler(nic_data);431 if (irq_cap < 0) {432 rc = irq_cap;433 ddf_msg(LVL_ERROR, "Failed to register IRQ handler (% d)", rc);430 int irq_cap; 431 rc = rtl8169_register_int_handler(nic_data, &irq_cap); 432 if (rc != EOK) { 433 ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%s)", str_error_name(rc)); 434 434 goto err_irq; 435 435 } … … 707 707 rc = rtl8169_allocate_buffers(rtl8169); 708 708 if (rc != EOK) { 709 ddf_msg(LVL_ERROR, "Error allocating buffers: % d", rc);709 ddf_msg(LVL_ERROR, "Error allocating buffers: %s", str_error_name(rc)); 710 710 return 0; 711 711 } … … 764 764 memory_barrier(); 765 765 while (pio_read_8(rtl8169->regs + CR) & CR_RST) { 766 thread_usleep(1);766 async_usleep(1); 767 767 read_barrier(); 768 768 } … … 1032 1032 } 1033 1033 1034 static void rtl8169_irq_handler(ipc_callid_t iid, ipc_call_t *icall, 1035 ddf_dev_t *dev) 1034 static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev) 1036 1035 { 1037 1036 assert(dev); … … 1178 1177 do { 1179 1178 phyar = pio_read_32(rtl8169->regs + PHYAR); 1180 thread_usleep(20);1179 async_usleep(20); 1181 1180 } while ((phyar & PHYAR_RW_WRITE) == 0); 1182 1181 … … 1196 1195 do { 1197 1196 phyar = pio_read_32(rtl8169->regs + PHYAR); 1198 thread_usleep(20);1197 async_usleep(20); 1199 1198 } while ((phyar & PHYAR_RW_WRITE) != 0); 1200 1199 1201 thread_usleep(20);1200 async_usleep(20); 1202 1201 } 1203 1202
Note:
See TracChangeset
for help on using the changeset viewer.