Changes in / [bf1733d3:c1fd281] in mainline


Ignore:
Files:
34 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    rbf1733d3 rc1fd281  
    115115                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
    116116        done
    117         for file in $(RD_DRVS_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         done
    122117        if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
    123118                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \

  • boot/Makefile.common

    rbf1733d3 rc1fd281  
    139139        nic/rtl8139 \
    140140        nic/rtl8169 \
    141         nic/ar9271 \
    142141        block/ahci
    143142
    144143RD_DRV_CFG =
    145 
    146 RD_DRVS_FW_NON_ESSENTIAL = \
    147         nic/ar9271
    148144
    149145RD_LIBS =
    … …  
    227223        $(USPACE_PATH)/app/viewer/viewer \
    228224        $(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
    231226
    232227RD_TESTS = \
    … …  
    252247RD_APPS = $(RD_APPS_ESSENTIAL)
    253248RD_DRVS = $(RD_DRVS_ESSENTIAL)
    254 RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
    255249else
    256250RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
    257251RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
    258252RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
    259 RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
    260253endif
    261254

  • uspace/Makefile

    rbf1733d3 rc1fd281  
    9494        app/wavplay \
    9595        app/websrv \
    96         app/wifi_supplicant \
    9796        srv/audio/hound \
    9897        srv/clipboard \
    … …  
    165164        drv/nic/rtl8139 \
    166165        drv/nic/rtl8169 \
    167         drv/nic/ar9271 \
    168166        drv/platform/icp
    169167
    … …  
    220218        lib/fs \
    221219        lib/block \
    222         lib/crypto \
    223220        lib/clui \
    224221        lib/fmtutil \
    … …  
    251248        lib/posix \
    252249        lib/mbr \
    253         lib/gpt \
    254         lib/ieee80211
     250        lib/gpt
    255251
    256252LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/Makefile.common

    rbf1733d3 rc1fd281  
    120120LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    121121
    122 LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto
    123122LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    124123LIBFS_PREFIX = $(LIB_PREFIX)/fs
    … …  
    144143LIBNET_PREFIX = $(LIB_PREFIX)/net
    145144LIBNIC_PREFIX = $(LIB_PREFIX)/nic
    146 LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211
    147145LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
    148146LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress

  • uspace/lib/c/generic/dhcp.c

    rbf1733d3 rc1fd281  
    8484}
    8585
    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 
    9686/** @}
    9787 */

  • uspace/lib/c/include/inet/dhcp.h

    rbf1733d3 rc1fd281  
    4141extern int dhcp_link_add(sysarg_t);
    4242extern int dhcp_link_remove(sysarg_t);
    43 extern int dhcp_discover(sysarg_t);
    4443
    4544#endif

  • uspace/lib/c/include/ipc/dev_iface.h

    rbf1733d3 rc1fd281  
    4848        /** Network interface controller interface */
    4949        NIC_DEV_IFACE,
    50                
    51         /** IEEE 802.11 interface controller interface */
    52         IEEE80211_DEV_IFACE,
    5350       
    5451        /** Interface provided by any PCI device. */

  • uspace/lib/c/include/ipc/dhcp.h

    rbf1733d3 rc1fd281  
    4141typedef enum {
    4242        DHCP_LINK_ADD = IPC_FIRST_USER_METHOD,
    43         DHCP_LINK_REMOVE,
    44         DHCP_DISCOVER
     43        DHCP_LINK_REMOVE
    4544} dhcp_request_t;
    4645

  • uspace/lib/drv/Makefile

    rbf1733d3 rc1fd281  
    4848        generic/remote_char_dev.c \
    4949        generic/remote_nic.c \
    50         generic/remote_ieee80211.c \
    5150        generic/remote_usb.c \
    5251        generic/remote_pci.c \

  • uspace/lib/drv/generic/dev_iface.c

    rbf1733d3 rc1fd281  
    4646#include "remote_battery_dev.h"
    4747#include "remote_nic.h"
    48 #include "remote_ieee80211.h"
    4948#include "remote_usb.h"
    5049#include "remote_usbhc.h"
    … …  
    6362                [CHAR_DEV_IFACE] = &remote_char_dev_iface,
    6463                [NIC_DEV_IFACE] = &remote_nic_iface,
    65                 [IEEE80211_DEV_IFACE] = &remote_ieee80211_iface,
    6664                [PCI_DEV_IFACE] = &remote_pci_iface,
    6765                [USB_DEV_IFACE] = &remote_usb_iface,

  • uspace/srv/locsrv/locsrv.c

    rbf1733d3 rc1fd281  
    13571357        cat = category_new("nic");
    13581358        categ_dir_add_cat(&cdir, cat);
    1359        
    1360         cat = category_new("ieee80211");
    1361         categ_dir_add_cat(&cdir, cat);
    13621359
    13631360        cat = category_new("visualizer");

  • uspace/srv/net/dhcp/dhcp.c

    rbf1733d3 rc1fd281  
    418418}
    419419
    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         return rc;
    436 }
    437 
    438420int dhcpsrv_link_add(service_id_t link_id)
    439421{
    … …  
    477459        }
    478460
     461        dlink->state = ds_selecting;
     462
    479463        log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER");
    480         rc = dhcp_discover_proc(dlink);
     464        rc = dhcp_send_discover(dlink);
    481465        if (rc != EOK) {
    482466                log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER.");
    … …  
    485469                goto error;
    486470        }
     471
     472        dlink->retries_left = dhcp_discover_retries;
     473        fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
     474            dhcpsrv_discover_timeout, dlink);
    487475
    488476        list_append(&dlink->links, &dhcp_links);
    … …  
    499487{
    500488        return ENOTSUP;
    501 }
    502 
    503 int dhcpsrv_discover(service_id_t link_id)
    504 {
    505         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
    506        
    507         dhcp_link_t *dlink = dhcpsrv_link_find(link_id);
    508        
    509         if (dlink == NULL) {
    510                 log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist",
    511                     link_id);
    512                 return EINVAL;
    513         }
    514        
    515         return dhcp_discover_proc(dlink);
    516489}
    517490

  • uspace/srv/net/dhcp/dhcp.h

    rbf1733d3 rc1fd281  
    4343extern int dhcpsrv_link_add(service_id_t);
    4444extern int dhcpsrv_link_remove(service_id_t);
    45 extern int dhcpsrv_discover(service_id_t);
    4645
    4746#endif

  • uspace/srv/net/dhcp/main.c

    rbf1733d3 rc1fd281  
    109109}
    110110
    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 
    124111static void dhcp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
    125112{
    … …  
    146133                case DHCP_LINK_REMOVE:
    147134                        dhcp_link_remove_srv(callid, &call);
    148                         break;
    149                 case DHCP_DISCOVER:
    150                         dhcp_discover_srv(callid, &call);
    151135                        break;
    152136                default:
Note: See TracChangeset for help on using the changeset viewer.