Changes in / [cc575ef9:749fe15b] in mainline
- Files:
-
- 34 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile
rcc575ef9 r749fe15b 115 115 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \ 116 116 done 117 for file in $(RD_DRV_FW) ; do \118 file_dir="`dirname "$$file"`" ; \119 file_name="`basename "$$file"`" ; \120 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \121 done122 117 if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \ 123 118 cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \ -
boot/Makefile.common
rcc575ef9 r749fe15b 139 139 nic/rtl8139 \ 140 140 nic/rtl8169 \ 141 nic/ar9271 \142 141 block/ahci 143 142 144 143 RD_DRV_CFG = 145 146 RD_DRV_FW = \147 nic/ar9271148 144 149 145 RD_LIBS = … … 227 223 $(USPACE_PATH)/app/viewer/viewer \ 228 224 $(USPACE_PATH)/app/df/df \ 229 $(USPACE_PATH)/app/fontviewer/fontviewer \ 230 $(USPACE_PATH)/app/wifi_supplicant/wifi_supplicant 225 $(USPACE_PATH)/app/fontviewer/fontviewer 231 226 232 227 RD_TESTS = \ -
boot/arch/amd64/Makefile.inc
rcc575ef9 r749fe15b 61 61 RD_DRV_CFG += \ 62 62 bus/isa 63 63 64 64 RD_APPS_ESSENTIAL += \ 65 65 $(USPACE_PATH)/app/edit/edit \ -
uspace/Makefile
rcc575ef9 r749fe15b 94 94 app/wavplay \ 95 95 app/websrv \ 96 app/wifi_supplicant \97 96 srv/audio/hound \ 98 97 srv/clipboard \ … … 165 164 drv/nic/rtl8139 \ 166 165 drv/nic/rtl8169 \ 167 drv/nic/ar9271 \168 166 drv/platform/icp 169 167 … … 220 218 lib/fs \ 221 219 lib/block \ 222 lib/crypto \223 220 lib/clui \ 224 221 lib/fmtutil \ … … 251 248 lib/posix \ 252 249 lib/mbr \ 253 lib/gpt \ 254 lib/ieee80211 \ 250 lib/gpt 255 251 256 252 LIBC_BUILD = $(addsuffix .build,$(LIBC)) -
uspace/Makefile.common
rcc575ef9 r749fe15b 120 120 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix 121 121 122 LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto123 122 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block 124 123 LIBFS_PREFIX = $(LIB_PREFIX)/fs … … 144 143 LIBNET_PREFIX = $(LIB_PREFIX)/net 145 144 LIBNIC_PREFIX = $(LIB_PREFIX)/nic 146 LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211147 145 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix 148 146 LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress -
uspace/lib/c/generic/dhcp.c
rcc575ef9 r749fe15b 84 84 } 85 85 86 int dhcp_discover(sysarg_t link_id)87 {88 async_exch_t *exch = async_exchange_begin(dhcp_sess);89 90 int rc = async_req_1_0(exch, DHCP_DISCOVER, link_id);91 async_exchange_end(exch);92 93 return rc;94 }95 96 86 /** @} 97 87 */ -
uspace/lib/c/include/inet/dhcp.h
rcc575ef9 r749fe15b 41 41 extern int dhcp_link_add(sysarg_t); 42 42 extern int dhcp_link_remove(sysarg_t); 43 extern int dhcp_discover(sysarg_t);44 43 45 44 #endif -
uspace/lib/c/include/ipc/dev_iface.h
rcc575ef9 r749fe15b 48 48 /** Network interface controller interface */ 49 49 NIC_DEV_IFACE, 50 51 /** IEEE 802.11 interface controller interface */52 IEEE80211_DEV_IFACE,53 50 54 51 /** Interface provided by any PCI device. */ -
uspace/lib/c/include/ipc/dhcp.h
rcc575ef9 r749fe15b 41 41 typedef enum { 42 42 DHCP_LINK_ADD = IPC_FIRST_USER_METHOD, 43 DHCP_LINK_REMOVE, 44 DHCP_DISCOVER 43 DHCP_LINK_REMOVE 45 44 } dhcp_request_t; 46 45 -
uspace/lib/drv/Makefile
rcc575ef9 r749fe15b 48 48 generic/remote_char_dev.c \ 49 49 generic/remote_nic.c \ 50 generic/remote_ieee80211.c \51 50 generic/remote_usb.c \ 52 51 generic/remote_pci.c \ -
uspace/lib/drv/generic/dev_iface.c
rcc575ef9 r749fe15b 46 46 #include "remote_battery_dev.h" 47 47 #include "remote_nic.h" 48 #include "remote_ieee80211.h"49 48 #include "remote_usb.h" 50 49 #include "remote_usbhc.h" … … 63 62 [CHAR_DEV_IFACE] = &remote_char_dev_iface, 64 63 [NIC_DEV_IFACE] = &remote_nic_iface, 65 [IEEE80211_DEV_IFACE] = &remote_ieee80211_iface,66 64 [PCI_DEV_IFACE] = &remote_pci_iface, 67 65 [USB_DEV_IFACE] = &remote_usb_iface, -
uspace/srv/locsrv/locsrv.c
rcc575ef9 r749fe15b 1357 1357 cat = category_new("nic"); 1358 1358 categ_dir_add_cat(&cdir, cat); 1359 1360 cat = category_new("ieee80211");1361 categ_dir_add_cat(&cdir, cat);1362 1359 1363 1360 cat = category_new("visualizer"); -
uspace/srv/net/dhcp/dhcp.c
rcc575ef9 r749fe15b 418 418 } 419 419 420 static int dhcp_discover_proc(dhcp_link_t *dlink)421 {422 dlink->state = ds_selecting;423 424 int rc = dhcp_send_discover(dlink);425 if (rc != EOK)426 return EIO;427 428 dlink->retries_left = dhcp_discover_retries;429 430 if(dlink->timeout->state == fts_not_set ||431 dlink->timeout->state == fts_fired) {432 fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,433 dhcpsrv_discover_timeout, dlink);434 }435 436 return rc;437 }438 439 420 int dhcpsrv_link_add(service_id_t link_id) 440 421 { … … 478 459 } 479 460 461 dlink->state = ds_selecting; 462 480 463 log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER"); 481 rc = dhcp_ discover_proc(dlink);464 rc = dhcp_send_discover(dlink); 482 465 if (rc != EOK) { 483 466 log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER."); … … 486 469 goto error; 487 470 } 471 472 dlink->retries_left = dhcp_discover_retries; 473 fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val, 474 dhcpsrv_discover_timeout, dlink); 488 475 489 476 list_append(&dlink->links, &dhcp_links); … … 500 487 { 501 488 return ENOTSUP; 502 }503 504 int dhcpsrv_discover(service_id_t link_id)505 {506 log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);507 508 dhcp_link_t *dlink = dhcpsrv_link_find(link_id);509 510 if (dlink == NULL) {511 log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist",512 link_id);513 return EINVAL;514 }515 516 return dhcp_discover_proc(dlink);517 489 } 518 490 -
uspace/srv/net/dhcp/dhcp.h
rcc575ef9 r749fe15b 43 43 extern int dhcpsrv_link_add(service_id_t); 44 44 extern int dhcpsrv_link_remove(service_id_t); 45 extern int dhcpsrv_discover(service_id_t);46 45 47 46 #endif -
uspace/srv/net/dhcp/main.c
rcc575ef9 r749fe15b 109 109 } 110 110 111 static void dhcp_discover_srv(ipc_callid_t callid, ipc_call_t *call)112 {113 sysarg_t link_id;114 int rc;115 116 log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_discover_srv()");117 118 link_id = IPC_GET_ARG1(*call);119 120 rc = dhcpsrv_discover(link_id);121 async_answer_0(callid, rc);122 }123 124 111 static void dhcp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg) 125 112 { … … 146 133 case DHCP_LINK_REMOVE: 147 134 dhcp_link_remove_srv(callid, &call); 148 break;149 case DHCP_DISCOVER:150 dhcp_discover_srv(callid, &call);151 135 break; 152 136 default:
Note:
See TracChangeset
for help on using the changeset viewer.