Changes in uspace/drv/nic/rtl8139/driver.c [1ae74c6:7de1988c] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/nic/rtl8139/driver.c
r1ae74c6 r7de1988c 620 620 if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) { 621 621 ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", " 622 "header 0x%4" PRIx 16 ". Offset: %d)", size, frame_header,622 "header 0x%4" PRIx32 ". Offset: %" PRIu16 ")", size, frame_header, 623 623 rx_offset); 624 624 goto rx_err; … … 1020 1020 } 1021 1021 1022 bzero(rtl8139, sizeof(rtl8139_t));1022 memset(rtl8139, 0, sizeof(rtl8139_t)); 1023 1023 1024 1024 rtl8139->nic_data = nic_data; … … 1087 1087 ddf_msg(LVL_DEBUG, "%s device: irq 0x%x assigned", ddf_dev_get_name(dev), rtl8139->irq); 1088 1088 1089 rtl8139->io_addr = IOADDR_TO_PTR( hw_resources->io_ranges.ranges[0].address);1089 rtl8139->io_addr = IOADDR_TO_PTR(RNGABS(hw_resources->io_ranges.ranges[0])); 1090 1090 if (hw_resources->io_ranges.ranges[0].size < RTL8139_IO_SIZE) { 1091 1091 ddf_msg(LVL_ERROR, "i/o range assigned to the device " … … 1144 1144 ddf_msg(LVL_DEBUG, "Creating buffers"); 1145 1145 1146 rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, AS_AREA_WRITE, 0,1147 &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt);1146 rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, DMAMEM_4GiB, 1147 AS_AREA_WRITE, 0, &rtl8139->tx_buff_phys, &rtl8139->tx_buff_virt); 1148 1148 if (rc != EOK) { 1149 1149 ddf_msg(LVL_ERROR, "Can not allocate transmitter buffers."); … … 1164 1164 RxBUF_TOT_LENGTH); 1165 1165 1166 rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, AS_AREA_READ, 0,1167 &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt);1166 rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, DMAMEM_4GiB, 1167 AS_AREA_READ, 0, &rtl8139->rx_buff_phys, &rtl8139->rx_buff_virt); 1168 1168 if (rc != EOK) { 1169 1169 ddf_msg(LVL_ERROR, "Can not allocate receive buffer.");
Note:
See TracChangeset
for help on using the changeset viewer.