Changes in / [34aad53d:522eecf] in mainline


Ignore:
Files:
13 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • abi/include/abi/ipc/interfaces.h

    r34aad53d r522eecf  
    202202            FOURCC_COMPACT('w', 'm', 'g', 't') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
    203203        INTERFACE_TBARCFG_NOTIFY =
    204             FOURCC_COMPACT('t', 'b', 'c', 'f') | IFACE_EXCHANGE_SERIALIZE,
    205         INTERFACE_PCAP_CONTROL =
    206             FOURCC_COMPACT('p', 'c', 't', 'l') | IFACE_EXCHANGE_SERIALIZE,
     204            FOURCC_COMPACT('t', 'b', 'c', 'f') | IFACE_EXCHANGE_SERIALIZE
    207205} iface_t;
    208206

  • uspace/app/meson.build

    r34aad53d r522eecf  
    7272        'nic',
    7373        'nterm',
    74         'pcapctl',
    7574        'ofw',
    7675        'pci',

  • uspace/drv/nic/e1k/e1k.c

    r34aad53d r522eecf  
    4949#include <nic.h>
    5050#include <ops/nic.h>
    51 #include <pcapdump_iface.h>
    5251#include "e1k.h"
    5352
    … …  
    175174        /** Lock for EEPROM access */
    176175        fibril_mutex_t eeprom_lock;
    177 
    178176} e1000_t;
    179177
    … …  
    11911189                if (frame != NULL) {
    11921190                        memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
    1193 
    11941191                        nic_received_frame(nic, frame);
    11951192                } else {
    … …  
    22062203                goto err_add_to_cat;
    22072204
    2208         rc = ddf_fun_add_to_category(fun, "pcap");
    2209         if (rc != EOK) {
    2210                 ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
    2211                 goto err_add_to_cat;
    2212         }
    2213 
    22142205        return EOK;
    22152206
    … …  
    23752366
    23762367        memcpy(e1000->tx_frame_virt[tdt], data, size);
     2368
    23772369        tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
    23782370        tx_descriptor_addr->length = size;

  • uspace/drv/nic/e1k/meson.build

    r34aad53d r522eecf  
    2727#
    2828
    29 deps = [ 'nic' , 'pcap' ]
     29deps = [ 'nic' ]
    3030src = files('e1k.c')

  • uspace/drv/nic/virtio-net/virtio-net.c

    r34aad53d r522eecf  
    4343
    4444#include <virtio-pci.h>
    45 #include <pcapdump_iface.h>
    4645
    4746#define NAME    "virtio-net"
    … …  
    432431            ddf_dev_get_name(dev));
    433432
    434         rc = ddf_fun_add_to_category(fun, "pcap");
    435         if (rc != EOK) {
    436                 ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
    437                 goto unbind;
    438         }
    439 
    440433        return EOK;
    441434

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

    r34aad53d r522eecf  
    6767#define SERVICE_NAME_VBD      "vbd"
    6868#define SERVICE_NAME_VOLSRV   "volsrv"
    69 #define SERVICE_NAME_DUMPPCAP "dumppcap"
     69
    7070#endif
    7171

  • uspace/lib/meson.build

    r34aad53d r522eecf  
    8181        'minix',
    8282        'nettl',
    83         'pcap',
    8483        'ofw',
    8584        'pcm',

  • uspace/lib/nic/include/nic.h

    r34aad53d r522eecf  
    4444#include <device/hw_res_parsed.h>
    4545#include <ops/nic.h>
    46 #include <pcap_iface.h>
    4746
    4847#define DEVICE_CATEGORY_NIC "nic"
    … …  
    279278extern void nic_sw_period_stop(nic_t *);
    280279
    281 /* pcapdump interface */
    282 extern pcap_iface_t *nic_get_pcap_iface(nic_t *);
    283 
    284280#endif // __NIC_H__
    285281

  • uspace/lib/nic/include/nic_driver.h

    r34aad53d r522eecf  
    4646#include <nic/nic.h>
    4747#include <async.h>
    48 #include <pcapdump_iface.h>
    4948
    5049#include "nic.h"
    … …  
    196195         */
    197196        poll_request_handler on_poll_request;
    198 
    199         /** Interface for dumping packets */
    200         pcap_iface_t pcapdump;
    201 
    202197        /** Data specific for particular driver */
    203198        void *specific;

  • uspace/lib/nic/meson.build

    r34aad53d r522eecf  
    2727#
    2828
    29 deps = [ 'drv' , 'pcap' ]
     29deps = [ 'drv' ]
    3030c_args = [ '-DLIBNIC_INTERNAL', ]
    3131src = files(

  • uspace/lib/nic/src/nic_driver.c

    r34aad53d r522eecf  
    4747#include <ops/nic.h>
    4848#include <errno.h>
    49 #include <pcapdump_iface.h>
    5049
    5150#include "nic_driver.h"
    … …  
    523522         *               calls it inside send_frame handler (with locked main lock)
    524523         */
    525         pcapdump_packet(nic_get_pcap_iface(nic_data), frame->data, frame->size);
    526524        fibril_rwlock_read_lock(&nic_data->rxc_lock);
    527525        nic_frame_type_t frame_type;
    … …  
    562560                fibril_rwlock_write_unlock(&nic_data->stats_lock);
    563561        }
    564         //pcapdump_packet(nic_get_pcap_iface(nic_data), frame->data, frame->size);
    565562        nic_release_frame(nic_data, frame);
    566563}
    … …  
    651648        nic_data->dev = device;
    652649
    653         errno_t pcap_rc  = pcapdump_init(nic_get_pcap_iface(nic_data));
    654         if (pcap_rc != EOK) {
    655                 printf("Failed creating pcapdump port\n");
    656         }
    657 
    658650        return nic_data;
    659651}
    … …  
    11411133}
    11421134
    1143 pcap_iface_t *nic_get_pcap_iface(nic_t *nic_data)
    1144 {
    1145         return &nic_data->pcapdump;
    1146 }
    1147 
    11481135/** @}
    11491136 */

  • uspace/lib/nic/src/nic_impl.c

    r34aad53d r522eecf  
    4040#include <ipc/services.h>
    4141#include <ns.h>
    42 #include <pcapdump_iface.h>
    4342#include "nic_driver.h"
    4443#include "nic_ev.h"
    … …  
    180179                return EBUSY;
    181180        }
    182         pcapdump_packet(nic_get_pcap_iface(nic_data), data, size);
     181
    183182        nic_data->send_frame(nic_data, data, size);
    184183        fibril_rwlock_read_unlock(&nic_data->main_lock);

  • uspace/srv/locsrv/locsrv.c

    r34aad53d r522eecf  
    13931393        categ_dir_add_cat(&cdir, cat);
    13941394
    1395         cat = category_new("pcap");
    1396         categ_dir_add_cat(&cdir, cat);
    13971395        return true;
    13981396}
Note: See TracChangeset for help on using the changeset viewer.