Changeset 2061

Show
Ignore:
Timestamp:
06/15/09 15:09:17 (3 years ago)
Author:
mwhitworth
Message:

Add to the network and Linux driver layer.

Location:
Whitix/branches/netchannel
Files:
19 added
4 removed
75 modified

Legend:

Unmodified
Added
Removed
  • Whitix/branches/netchannel/Makefile

    r1416 r2061  
    1515TAGS = ctags -I SYMBOL_EXPORT -I PACKED 
    1616override GENISO_FLAGS += -c Boot/boot.catalog -R -input-charset iso8859-1 -b Boot/Grub/stage2_eltorito -m'.svn' -no-emul-boot -boot-load-size 4 -boot-info-table -iso-level 2 -l CdRoot 
     17 
     18MAKEFLAGS += --no-print-directory 
    1719 
    1820#Make sure all makefiles can see everything 
     
    5355        ld -M -T link.ld arch/$(ARCH)/boot/*.o arch/$(ARCH)/acpi/*.o arch/$(ARCH)/lib/*.o arch/$(ARCH)/kernel/*.o \ 
    5456         arch/$(ARCH)/mm/*.o fs/icfs/*.o fs/kfs/*.o fs/vfs/*.o fs/devfs/*.o \ 
    55          devices/kedev/*.o devices/acpi/*.o devices/misc/*.o kernel/*.o lib/*.o memory/*.o net/*.o video/*.o \ 
     57         devices/kedev/*.o devices/acpi/*.o devices/misc/*.o devices/pci/*.o kernel/*.o lib/*.o memory/*.o net/*.o net/channels/*.o video/*.o \ 
    5658          -o kern > kernel.txt 
    5759        mkdir -p $(DIRMODULES) 
    5860        $(MAKE) -C fs modules_install 
    5961        $(MAKE) -C devices modules_install 
    60         $(MAKE) -C memory modules_install 
     62        $(MAKE) -C net modules_install 
    6163        $(MAKE) -C video modules_install 
    6264 
  • Whitix/branches/netchannel/arch/i386/kernel/ints.c

    r1094 r2061  
    4949        return 0; 
    5050} 
     51 
     52SYMBOL_EXPORT(IrqAddEntry); 
    5153 
    5254int IrqAdd(BYTE irq, Irq isr, void* data) 
  • Whitix/branches/netchannel/arch/i386/kernel/process.c

    r1275 r2061  
    199199                KePrint("process id = %u process name = %s\n",current->pid,ThrGetProcName(current->pid)); 
    200200 
     201        cli(); hlt(); 
     202 
    201203        if (!(curr->cs & 0x3)) 
    202204                ThrArchPrintStack(esp); 
  • Whitix/branches/netchannel/bochsrc.txt

    r728 r2061  
    2222com4: enabled=0 
    2323usb1: enabled=0 
    24 i440fxsupport: enabled=1 
     24#i440fxsupport: enabled=1, slot2=ne2k 
    2525vga_update_interval: 40000 
    2626vga: extension=vbe 
     
    3030clock: sync=none, time0=local 
    3131# no cmosimage 
    32 ne2k: enabled=1, ioaddr=0x800, irq=7, mac=DE:AD:BE:EF:00:01 
     32ne2k: enabled=1, ioaddr=0x800, irq=7, mac=b0:c4:20:00:00:01, ethmod=vnet, ethdev=eth0 
    3333pnic: enabled=0 
    3434sb16: enabled=0 
  • Whitix/branches/netchannel/devices/Makefile

    r1679 r2061  
    33        $(MAKE) -C input 
    44        $(MAKE) -C misc 
     5        $(MAKE) -C linux 
    56        $(MAKE) -C net 
    67        $(MAKE) -C pci 
     
    1213        $(MAKE) -C net modules_install 
    1314        $(MAKE) -C storage modules_install 
     15        $(MAKE) -C linux modules_install 
    1416 
    1517clean: 
     
    2123        $(MAKE) -C pci clean 
    2224        $(MAKE) -C kedev clean 
     25        $(MAKE) -C linux clean 
  • Whitix/branches/netchannel/devices/linux/dma.c

    r1889 r2061  
    44#include <typedefs.h> 
    55 
    6 struct device 
     6#include "include/pci.h" 
     7#include "include/module.h" 
     8 
     9quickcall void* dma_alloc_coherent(struct device* dev, unsigned long size, void* handle, int gfp); 
     10void* dma_free_coherent(struct device* dev, unsigned long size, void* cpu_addr, unsigned int handle); 
     11quickcall unsigned long dma_map_single(struct device* hwdev, void* ptr, unsigned long size, int direction); 
     12quickcall void dma_unmap_single(struct device* hwdev, void* ptr, unsigned long size, int direction); 
     13quickcall void dma_sync_single_for_cpu(struct device* hwdev, void* ptr, unsigned long size, 
     14                int direction); 
     15quickcall void dma_sync_single_for_device(struct device* hwdev, void* ptr, unsigned long size, 
     16                int direction); 
     17 
     18struct dma_mapping_ops 
    719{ 
     20    int             (*mapping_error)(unsigned long dma_addr); 
     21    quickcall void*           (*alloc_coherent)(struct device *dev, unsigned long size, 
     22                                void* dma_handle, unsigned long gfp); 
     23    quickcall void*           (*free_coherent)(struct device *dev, unsigned long size, 
     24                                void* dma_handle, unsigned long dmaAddr); 
     25    quickcall unsigned long             (*map_single)(struct device* hwdev, void* ptr, unsigned long size, 
     26                int direction); 
     27    void* map_simple; 
     28    quickcall void      (*unmap_single)(struct device* hwdev, void* ptr, unsigned long size, 
     29                int direction); 
     30     
     31    quickcall void (*sync_single_for_cpu)(struct device* hwdev, void* ptr, unsigned long size, 
     32                int direction); 
     33     
     34    quickcall void (*sync_single_for_device)(struct device* hwdev, void* ptr, unsigned long size, 
     35                int direction); 
     36    /* TODO: The rest. */ 
    837}; 
    938 
    10 void* dma_ops; 
     39struct dma_mapping_ops default_dma_ops = 
     40{ 
     41        .alloc_coherent = dma_alloc_coherent, 
     42        .free_coherent = dma_free_coherent, 
     43        .map_single = dma_map_single, 
     44        .unmap_single = dma_unmap_single, 
     45        .sync_single_for_cpu = dma_sync_single_for_cpu, 
     46        .sync_single_for_device = dma_sync_single_for_device, 
     47}; 
     48 
     49void* dma_ops = &default_dma_ops; 
    1150 
    1251SYMBOL_EXPORT(dma_ops); 
    1352 
    14 void* dma_alloc_coherent(struct device* dev, unsigned long size, void* handle, int gfp) 
     53quickcall void* dma_alloc_coherent(struct device* dev, unsigned long size, void* handle, int gfp) 
    1554{ 
    16         KePrint("dma_alloc_coherent\n"); 
    17         return NULL; 
     55        struct PciDevice* device = (struct PciDevice*)dev->devP; 
     56        void* ret; 
     57         
     58        ret = PciAllocConsistent(device, size, handle); 
     59         
     60        return ret; 
    1861} 
    1962 
     
    2871SYMBOL_EXPORT(dma_free_coherent); 
    2972 
    30 int dma_supported(struct device* dev, unsigned long long mask) 
     73quickcall unsigned long dma_map_single(struct device* hwdev, void* ptr, unsigned long size, int direction) 
    3174{ 
    32         KePrint("dma_supported\n"); 
     75        DWORD virt = ptr + 0xC0000000; 
     76         
     77        return VirtToPhys(virt); 
     78} 
     79 
     80quickcall void dma_unmap_single(struct device* hwdev, void* ptr, unsigned long size, int direction) 
     81{ 
     82} 
     83 
     84quickcall int dma_supported(struct device* dev, unsigned long long mask) 
     85{ 
     86        return (mask <= 0xFFFFFFFF); 
     87} 
     88 
     89SYMBOL_EXPORT(dma_supported); 
     90 
     91quickcall int dma_alloc_from_coherent(struct device* dev, unsigned int size, unsigned long* addr, void** ret) 
     92{ 
     93        *ret = dma_alloc_coherent(dev, size, addr, 0); 
     94         
    3395        return 1; 
    3496} 
    3597 
    36 SYMBOL_EXPORT(dma_supported); 
     98SYMBOL_EXPORT(dma_alloc_from_coherent); 
     99 
     100quickcall int dma_release_from_coherent(struct device* dev, int order, void* vaddr) 
     101{ 
     102        KePrint("dma_release_from_coherent\n"); 
     103        return 1; 
     104} 
     105 
     106SYMBOL_EXPORT(dma_release_from_coherent); 
     107 
     108quickcall void dma_sync_single_for_cpu(struct device* hwdev, void* ptr, unsigned long size, 
     109                int direction) 
     110{ 
     111//      KePrint("dma_sync_single_for_cpu\n"); 
     112} 
     113 
     114quickcall void dma_sync_single_for_device(struct device* hwdev, void* ptr, unsigned long size, 
     115                int direction) 
     116{ 
     117//      KePrint("dma_sync_single_for_device\n"); 
     118}                
     119 
     120unsigned int x86_dma_fallback_dev; 
     121 
     122SYMBOL_EXPORT(x86_dma_fallback_dev); 
  • Whitix/branches/netchannel/devices/linux/eth.c

    r1889 r2061  
    2525{ 
    2626        KePrint("mii_link_ok\n"); 
    27         return 0; 
     27        return 1; 
    2828} 
    2929 
     
    4646SYMBOL_EXPORT(generic_mii_ioctl); 
    4747 
     48DWORD ethtool_op_get_link(void* dev) 
     49{ 
     50        KePrint("ethtool_op_get_link\n"); 
     51        return 0; 
     52} 
     53 
     54SYMBOL_EXPORT(ethtool_op_get_link); 
     55 
     56int ethtool_op_set_sg(struct net_device *dev, DWORD data) 
     57{ 
     58        KePrint("ethtool_op_set_sg\n"); 
     59        return 0; 
     60} 
     61 
    4862unsigned short eth_type_trans(void* skb, void* dev) 
    4963{ 
    50         KePrint("eth_type_trans\n"); 
     64        /* FIXME: Don't need to implement this? */ 
    5165        return 0; 
    5266} 
     
    5468SYMBOL_EXPORT(eth_type_trans); 
    5569 
    56 quickcall void print_mac(char mac[6]) 
     70#define ETH_BUF_LEN             18 
     71#define ETH_ADDR_LEN    6 
     72 
     73quickcall char* print_mac(char* mac, unsigned char* addr) 
    5774{ 
     75        char* cp = mac; 
    5876        int i; 
    5977         
    60         for (i=0; i<6; i++) 
    61                 KePrint("%2.2X%c", mac[i], (i == 5) ? '\n' : ':'); 
     78        for (i = 0; i < ETH_ADDR_LEN; i++) 
     79        { 
     80                cp += scnprintf(cp, ETH_BUF_LEN - (cp - mac), "%02x", addr[i]); 
     81                if (i == ETH_ADDR_LEN - 1) 
     82                        break; 
     83                         
     84                cp += strlcpy(cp, ":", ETH_BUF_LEN - (cp - mac)); 
     85        } 
     86 
     87        return mac; 
    6288} 
    6389 
     
    7399quickcall struct net_device* alloc_etherdev_mq(int priv, unsigned int queue_count) 
    74100{ 
    75         struct net_device* ret = (struct net_device*)MemAlloc(sizeof(struct net_device)); 
     101        struct net_device* ret = (struct net_device*)MemAlloc(sizeof(struct net_device) + priv + 1000); 
     102         
     103        INIT_LIST_HEAD(&ret->dev_list); 
     104        INIT_LIST_HEAD(&ret->napi_list); 
     105         
     106//      KePrint("alloc_etherdev_mq\n"); 
    76107         
    77108        return ret; 
  • Whitix/branches/netchannel/devices/linux/include/net.h

    r1889 r2061  
    22#define LINUX_NET_H 
    33 
     4#include <llist.h> 
     5#include <timer.h> 
     6 
     7#include <net/buffer.h> 
     8#include <net/eth.h> 
     9 
     10#include "module.h" 
     11 
     12#define SMP_ALIGN               128 
     13 
     14struct sk_buff; 
     15 
     16struct net_device_stats 
     17{ 
     18        unsigned long rx_packets; 
     19        unsigned long   tx_packets;             /* total packets transmitted    */ 
     20        unsigned long   rx_bytes;               /* total bytes received         */ 
     21        unsigned long   tx_bytes;               /* total bytes transmitted      */ 
     22        unsigned long   rx_errors;              /* bad packets received         */ 
     23        unsigned long   tx_errors;              /* packet transmit problems     */ 
     24        unsigned long   rx_dropped;             /* no space in linux buffers    */ 
     25        unsigned long   tx_dropped;             /* no space available in linux  */ 
     26        unsigned long   multicast;              /* multicast packets received   */ 
     27        unsigned long   collisions; 
     28         
     29        /* detailed rx_errors: */ 
     30        unsigned long   rx_length_errors; 
     31        unsigned long   rx_over_errors;         /* receiver ring buff overflow  */ 
     32        unsigned long   rx_crc_errors;          /* recved pkt with crc error    */ 
     33        unsigned long   rx_frame_errors;        /* recv'd frame alignment error */ 
     34        unsigned long   rx_fifo_errors;         /* recv'r fifo overrun          */ 
     35        unsigned long   rx_missed_errors;       /* receiver missed packet       */ 
     36         
     37        /* detailed tx_errors */ 
     38        unsigned long   tx_aborted_errors; 
     39        unsigned long   tx_carrier_errors; 
     40        unsigned long   tx_fifo_errors; 
     41        unsigned long   tx_heartbeat_errors; 
     42        unsigned long   tx_window_errors; 
     43                
     44        /* for cslip etc */ 
     45        unsigned long   rx_compressed; 
     46        unsigned long   tx_compressed; 
     47}; 
     48 
     49struct net_device; 
     50 
     51struct net_queue 
     52{ 
     53        struct net_device* dev; 
     54        void* qdisc; 
     55        unsigned long state; 
     56        unsigned long lock; 
     57        int lock_owner; 
     58        void* qdisc_sleeping; 
     59}__attribute__((aligned(SMP_ALIGN))); 
     60 
     61#if 0 
     62struct net_device_ops 
     63{ 
     64        void* init; 
     65        void* uninit; 
     66        quickcall int (*ndo_open)(struct net_device* dev); 
     67}; 
     68#endif 
     69 
    470struct net_device 
    571{ 
    672        char name[16]; 
     73        char hlist[8]; 
     74        char* ifalias; 
     75         
     76        unsigned long mem_end; 
     77        unsigned long mem_start; 
     78        unsigned long base_addr; 
     79        unsigned int irq; 
     80         
     81        unsigned char if_port; 
     82        unsigned char dma; 
     83         
     84        unsigned long state; 
     85        struct ListHead dev_list; 
     86        struct ListHead napi_list; 
     87         
     88        void* init; 
     89                 
     90        unsigned long features; 
     91         
     92        int ifindex; 
     93        int iflink; 
     94         
     95        void* get_stats; 
     96        struct net_device_stats stats; 
     97                         
     98        void* ethtool_ops; 
     99        void* header_ops; 
     100         
     101        unsigned int flags; 
     102        unsigned short gflags; 
     103        unsigned short priv_flags; 
     104        unsigned short padded; 
     105         
     106        unsigned char operstate; 
     107        unsigned char link_mode; 
     108         
     109        unsigned         mtu; 
     110        unsigned short type; 
     111        unsigned short hard_header_len; 
     112         
     113        unsigned short needed_headroom; 
     114        unsigned short needed_tailroom; 
     115         
     116        void* master; 
     117         
     118        unsigned char perm_addr[32]; 
     119        unsigned char addr_len; 
     120        unsigned short dev_id; 
     121         
     122        unsigned int spinlock; 
     123        void* uc_list; 
     124        int uc_count; 
     125        int uc_promisc; 
     126        void* mc_list; 
     127        int mc_count; 
     128        unsigned int promisc; 
     129        unsigned int allmulti; 
     130         
     131        void* privdatas[6]; 
     132         
     133        struct ListHead poll_list; 
     134        int (*poll)(void* dev, int* quota); 
     135        int quota; 
     136        int weight; 
     137         
     138        unsigned long last_rx; 
     139        unsigned char dev_addr[32]; 
     140        unsigned char broadcast[32]; 
     141         
     142        struct net_queue rx_queue; 
     143                 
     144        struct net_queue* tx_queue __attribute__((aligned(SMP_ALIGN))); 
     145                 
     146        unsigned int num_tx_queues; 
     147        unsigned int real_num_tx_queues; 
     148         
     149        unsigned long tx_queue_len; 
     150        unsigned long tx_global_lock; 
     151         
     152//      void* gso_skb; 
     153         
     154//      unsigned long ingress_lock; 
     155//      void* ingress; 
     156         
     157//      unsigned _xmit_lock __attribute__((aligned(16))); 
     158        void* priv; 
     159        quickcall int (*hard_start_xmit)(struct sk_buff* skb, struct net_device* dev); 
     160         
     161        unsigned long trans_start; 
     162        int watchdog_timeo; 
     163        struct Timer watchdog_timer; 
     164 
     165        unsigned int refcnt __attribute__((aligned(SMP_ALIGN))); 
     166         
     167        struct ListHead todo_list; 
     168        char another_hlist[8]; 
     169         
     170        void* link_watchnext; 
     171         
     172        int reg_state; 
     173         
     174        void* uninit; 
     175        void* destructor; 
     176         
     177        quickcall int (*open)(struct net_device* dev); 
     178         
     179        char data[2000]; 
     180        struct EthDevice* ethDevice; 
     181}; 
     182 
     183struct sk_buff 
     184{ 
     185        void* next, *prev; 
     186        void* sock; 
     187        DWORD timestampHi; 
     188        DWORD timestampLo; 
     189         
     190        struct net_device* dev; 
     191        void* un; 
     192        void* path; 
     193        char cb[48]; 
     194 
     195        unsigned int len, dataLen; 
     196        WORD macLen, hdrLen; 
     197        WORD cSumStart, cSumOffset; 
     198         
     199        DWORD priority; 
     200         
     201        WORD bitFields; 
     202        WORD protocol; 
     203         
     204        void (*destructor)(struct sk_buff* buff); 
     205        DWORD ct[2]; 
     206        int iif; 
     207        WORD queueMapping; 
     208         
     209        DWORD tc; 
     210         
     211        BYTE options; 
     212         
     213        DWORD dmaCookie; 
     214         
     215        DWORD secMark; 
     216        DWORD mark; 
     217        WORD vlanTci;    
     218         
     219        /* Headers */ 
     220        unsigned char* transportHeader; 
     221        unsigned char* networkHeader; 
     222        unsigned char* macHeader;        
     223         
     224        unsigned char* tail; 
     225        unsigned char* end; 
     226        unsigned char* head, *data; 
     227        unsigned int trueSize; 
     228        int users; 
     229         
     230        struct NetBuffer buffer; 
     231}; 
     232 
     233quickcall char* print_mac(char* mac, unsigned char* addr); 
     234 
     235struct napi_struct 
     236{ 
     237        struct ListHead pollList; 
     238        unsigned long state; 
     239        int weight; 
     240        int quickcall (*poll)(struct napi_struct*, int); 
     241        unsigned long poll_lock; 
     242        int poll_owner; 
     243        struct net_device* dev; 
     244        struct ListHead devList; 
    7245}; 
    8246 
  • Whitix/branches/netchannel/devices/linux/include/pci.h

    r1889 r2061  
    55#include <typedefs.h> 
    66 
     7#define PCI_TODEV(pdev) ((struct PciDevice*)((pdev)->dev.devP)) 
     8 
    79struct device 
    810{ 
    9         char data[200+112]; 
     11        void* devP; 
     12        char data[200+108+20]; 
    1013}; 
    1114 
     
    3235        struct pci_driver* driver; 
    3336        unsigned long long dma_mask; 
    34         int dma_params; 
     37         
     38        /* dma params */ 
     39        unsigned int max_segment_size; 
     40        unsigned long segment_boundary_mask; 
     41         
    3542        int current_state; 
    3643        int pm_cap; 
     
    4754        unsigned int irq; 
    4855        struct resource resources[12]; 
    49         void* data; 
    5056}; 
    5157 
     
    5460        struct ListHead list; 
    5561        char* name; 
    56         struct PciDeviceId* id_table; /* Binary compatiable */ 
     62        struct PciDeviceId* id_table; /* The two tables are binary compatible. */ 
    5763        __attribute__ ((regparm(3))) int (*probe)(struct pci_device* dev, const struct PciDeviceId* id); 
    5864        void* data; 
  • Whitix/branches/netchannel/devices/linux/irq.c

    r1889 r2061  
    33#include <pci.h> 
    44#include <print.h> 
     5 
     6#include "include/irq.h" 
     7#include "include/module.h" 
    58 
    69int synchronize_irq(unsigned int irq) 
     
    1215SYMBOL_EXPORT(synchronize_irq); 
    1316 
    14 void free_irq(unsigned int irq, void* dev_id) 
     17quickcall void free_irq(unsigned int irq, void* dev_id) 
    1518{ 
    1619        KePrint("free_irq(%u)\n", irq); 
     
    4952SYMBOL_EXPORT(probe_irq_on); 
    5053 
    51 int request_irq(unsigned int irq, void (*handler)(int, void*, void*), 
     54int LinuxIsr(void* data) 
     55{ 
     56        struct linux_irq* entry = (struct linux_irq*)data; 
     57         
     58        if (entry->func) 
     59                entry->func(entry->irq, entry->data); 
     60        else 
     61                return 0; 
     62} 
     63 
     64quickcall int request_irq(unsigned int irq, void (*handler)(int, void*, void*), 
    5265        unsigned long irqflags, const char* devname, void* devid) 
    5366{ 
    54         KePrint("request_irq(%u)\n", irq); 
     67        struct linux_irq* entry = (struct linux_irq*)MemAlloc(sizeof(struct linux_irq)); 
     68                 
     69        entry->entry.irq = LinuxIsr; 
     70        entry->entry.data = entry; 
     71         
     72        entry->irq = irq; 
     73        entry->func = handler; 
     74        entry->data = devid; 
     75                 
     76        IrqAddEntry(irq, &entry->entry); 
     77         
    5578        return 0; 
    5679} 
     
    7295SYMBOL_EXPORT(local_bh_enable); 
    7396 
    74 void _spin_lock(void* lock) 
     97quickcall void _spin_lock(void* lock) 
    7598{ 
    76         KePrint("_spin_lock\n"); 
     99//      KePrint("_spin_lock\n"); 
    77100} 
    78101 
    79102SYMBOL_EXPORT(_spin_lock); 
    80103 
    81 void _spin_lock_irqsave(void* lock) 
     104quickcall void _spin_lock_irqsave(void* lock) 
    82105{ 
    83         KePrint("_spin_lock_irqsave\n"); 
     106        IrqSaveFlags(*(DWORD*)lock); 
    84107} 
    85108 
    86109SYMBOL_EXPORT(_spin_lock_irqsave); 
    87110 
    88 void _spin_unlock_irqrestore(void* lock) 
     111quickcall void _spin_unlock_irqrestore(void* lock) 
    89112{ 
    90         KePrint("_spin_unlock_irqrestore\n"); 
     113        IrqRestoreFlags(*(DWORD*)lock); 
    91114} 
    92115 
    93116SYMBOL_EXPORT(_spin_unlock_irqrestore); 
    94117 
    95 /* TODO: CHECK */ 
    96 unsigned int pv_lock_ops; 
     118struct pv_lock_ops 
     119{ 
     120        void* ptr1; 
     121        void* ptr2; 
     122        void* ptr3; 
     123        void quickcall (*spin_lock_flags)(void* lock, unsigned int flags); 
     124        void quickcall (*trylock)(void* lock); 
     125        void quickcall (*unlock)(void* lock); 
     126}; 
     127 
     128void quickcall lock_spin_lock_flags(void* lock, unsigned int flags) 
     129{ 
     130        KePrint("lock_spin_lock_flags\n"); 
     131} 
     132 
     133void quickcall lock_trylock(void* lock) 
     134{ 
     135        KePrint("lock_trylock\n"); 
     136} 
     137 
     138void quickcall lock_unlock(void* lock) 
     139{ 
     140//      KePrint("lock_unlock\n"); 
     141} 
     142 
     143struct pv_lock_ops pv_lock_ops = { 
     144        NULL, NULL, NULL, lock_spin_lock_flags, lock_trylock, lock_unlock 
     145}; 
    97146 
    98147SYMBOL_EXPORT(pv_lock_ops); 
     148 
     149unsigned int pv_irq_ops; 
     150 
     151SYMBOL_EXPORT(pv_irq_ops); 
  • Whitix/branches/netchannel/devices/linux/mem.c

    r1889 r2061  
    11#include <console.h> 
    22#include <module.h> 
     3#include <malloc.h> 
    34#include <print.h> 
    45 
    5 void kfree(void* addr) 
     6#include "include/module.h" 
     7 
     8quickcall void kfree(void* addr) 
    69{ 
    7         KePrint("kfree\n"); 
     10        KePrint("kfree(%#X)\n", addr); 
     11        MemFree(addr); 
    812} 
    913 
    1014SYMBOL_EXPORT(kfree); 
    1115 
    12 void kfree_skb(void* skb) 
     16quickcall void kfree_skb(void* skb) 
    1317{ 
    1418        KePrint("kfree_skb\n"); 
     
    1721SYMBOL_EXPORT(kfree_skb); 
    1822 
    19 void* __kmalloc(unsigned long size, int flags) 
     23quickcall void* __kmalloc(unsigned long size, int flags) 
    2024{ 
    21         KePrint("__kmalloc\n"); 
    22         return NULL; 
     25        return MemAlloc(size); 
    2326} 
    2427 
    2528SYMBOL_EXPORT(__kmalloc); 
    2629 
    27 void printk(const char* message, ...) 
     30quickcall void printk(const char* message, ...) 
    2831{ 
    2932        VaList args; 
    30                          
     33 
    3134        VaStart(args, message); 
    3235        KeVaPrint(message, args); 
     
    3538 
    3639SYMBOL_EXPORT(printk); 
     40 
     41quickcall void warn_on_slowpath() 
     42{ 
     43        KePrint("warn_on_slowpath\n"); 
     44} 
     45 
     46SYMBOL_EXPORT(warn_on_slowpath); 
  • Whitix/branches/netchannel/devices/linux/net.c

    r1889 r2061  
    11#include <console.h> 
    22#include <module.h> 
    3  
    4 unsigned char* skb_put(void* skb, unsigned int len) 
    5 { 
    6         KePrint("skb_put\n"); 
    7         return NULL; 
     3#include <print.h> 
     4#include <tasklet.h> 
     5 
     6#include <net/device.h> 
     7 
     8#include "include/module.h" 
     9#include "include/net.h" 
     10 
     11quickcall struct sk_buff* dev_alloc_skb(unsigned int length); 
     12 
     13quickcall unsigned char* skb_put(struct sk_buff* skb, unsigned int len) 
     14{ 
     15        unsigned char* temp = skb->tail; 
     16         
     17//      KePrint("skb_put(%#X, %d), %#X %#X\n", skb->tail, len, skb->len, skb->end); 
     18         
     19        skb->tail += len; 
     20        skb->len += len; 
     21         
     22        return temp; 
    823} 
    924 
     
    1227/* netif */ 
    1328 
    14 void __netif_schedule(void* dev) 
     29quickcall void __netif_schedule(void* dev) 
    1530{ 
    1631        KePrint("__netif_schedule\n"); 
     
    4762SYMBOL_EXPORT(netif_device_detach); 
    4863 
    49 int netif_receive_skb(void* skb) 
    50 { 
    51         KePrint("netif_receive_skb\n"); 
     64quickcall int netif_receive_skb(struct sk_buff* skb) 
     65{        
     66        skb->buffer.data = skb->buffer.start = skb->data; 
     67        skb->buffer.length = skb->len; 
     68         
     69        return EthRecv(skb->dev->ethDevice, &skb->buffer); 
     70} 
     71 
     72SYMBOL_EXPORT(netif_receive_skb); 
     73 
     74int LinuxNetSend(struct NetDevice* device, struct NetBuffer* sockBuff) 
     75{ 
     76        struct net_device* dev = (struct net_device*)(device->priv); 
     77        struct sk_buff* skb = dev_alloc_skb(sockBuff->length); 
     78         
     79        memcpy(skb->data, sockBuff->data, sockBuff->length); 
     80         
     81        skb->end = skb->tail = skb->head + sockBuff->length;     
     82        skb->len = sockBuff->length; 
     83         
     84        return dev->hard_start_xmit(skb, dev); 
     85} 
     86 
     87struct NetDevOps linuxNetOps= 
     88{ 
     89        .send = LinuxNetSend, 
     90}; 
     91 
     92/* netdev */ 
     93quickcall int register_netdev(struct net_device* dev) 
     94{ 
     95        char buf[18]; 
     96        int ret = 0; 
     97        struct EthDevice* ethDev; 
     98        struct NetDevice* netDev; 
     99                 
     100        /* Figure out offset of dev_addr */ 
     101        memset(dev->dev_addr, 0x22, 6); 
     102                 
     103        /* Alloc in ethdev_mq */ 
     104        dev->tx_queue = (struct net_queue*)MemAlloc(sizeof(struct net_queue)); 
     105        dev->tx_queue->state = 0; 
     106         
     107        netDev = NetDeviceAlloc();       
     108        ethDev = dev->ethDevice = EthDeviceAlloc(netDev); 
     109         
     110        memcpy(ethDev->macAddress, dev->dev_addr, 6); 
     111         
     112        EthDeviceRegister(ethDev); 
     113         
     114        netDev->ops = &linuxNetOps; 
     115        netDev->priv = netDev->procPriv = dev; 
     116         
     117        strcpy(dev->name, "eth0", sizeof("eth0")); 
     118         
     119        if (dev->open) 
     120                ret = dev->open(dev); 
     121                         
     122        return ret; 
     123} 
     124 
     125SYMBOL_EXPORT(register_netdev); 
     126 
     127void unregister_netdev(void* dev) 
     128{ 
     129        KePrint("unregister_netdev(%#X)\n", dev); 
     130} 
     131 
     132SYMBOL_EXPORT(unregister_netdev); 
     133 
     134void free_netdev(void* dev) 
     135{ 
     136        KePrint("free_netdev\n"); 
     137} 
     138 
     139SYMBOL_EXPORT(free_netdev); 
     140 
     141quickcall void __napi_schedule(struct napi_struct* n) 
     142{ 
     143        DWORD flags; 
     144        int work = 0; 
     145         
     146        IrqSaveFlags(flags); 
     147        sti(); 
     148 
     149        if (n->state & 0x1) 
     150                work = n->poll(n, 16); 
     151 
     152        IrqRestoreFlags(flags); 
     153} 
     154 
     155SYMBOL_EXPORT(__napi_schedule); 
     156 
     157void dev_kfree_skb_any(void* skb) 
     158{ 
     159        if (!IrqsEnabled()) 
     160        { 
     161                KePrint("dev_kfree_skb_any: free in irq\n"); 
     162        }else{ 
     163                KePrint("dev_kfree_skb_any: free in normal\n"); 
     164        } 
     165} 
     166 
     167SYMBOL_EXPORT(dev_kfree_skb_any); 
     168 
     169quickcall struct sk_buff* dev_alloc_skb(unsigned int length) 
     170{ 
     171        struct sk_buff* ret = (struct sk_buff*)MemAlloc(sizeof(struct sk_buff)+length); 
     172         
     173//      KePrint("dev_alloc_skb(%u)\n", length); 
     174         
     175        ZeroMemory(ret, OffsetOf(struct sk_buff, tail)); 
     176         
     177        ret->tail = ret->head = ret->data = MemAlloc(length); 
     178        ret->trueSize = sizeof(struct sk_buff) + length; 
     179        ret->end = ret->data + length; 
     180         
     181        ret->users = 1; 
     182         
     183        return ret; 
     184} 
     185 
     186SYMBOL_EXPORT(dev_alloc_skb); 
     187 
     188unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta) 
     189{ 
     190        KePrint("__pskb_pull_tail\n"); 
    52191        return 0; 
    53192} 
    54193 
    55 SYMBOL_EXPORT(netif_receive_skb); 
    56  
    57 /* netdev */ 
    58 int register_netdev(void* dev) 
    59 { 
    60         KePrint("register_netdev(%#X)\n", dev); 
     194SYMBOL_EXPORT(__pskb_pull_tail); 
     195 
     196int __vlan_hwaccel_rx(void* skb, void* grp, WORD tci, int polling) 
     197{ 
     198        KePrint("__vlan_hwaccel_rx\n"); 
    61199        return 0; 
    62200} 
    63201 
    64 SYMBOL_EXPORT(register_netdev); 
    65  
    66 void unregister_netdev(void* dev) 
    67 { 
    68         KePrint("unregister_netdev(%#X)\n", dev); 
    69 } 
    70  
    71 SYMBOL_EXPORT(unregister_netdev); 
    72  
    73 void free_netdev(void* dev) 
    74 { 
    75         KePrint("free_netdev\n"); 
    76 } 
    77  
    78 SYMBOL_EXPORT(free_netdev); 
    79  
    80 void __napi_schedule() 
    81 { 
    82         KePrint("__napi_schedule\n"); 
    83 } 
    84  
    85 SYMBOL_EXPORT(__napi_schedule); 
    86  
    87 void dev_kfree_skb_any(void* skb) 
    88 { 
    89         KePrint("dev_kfree_skb_any\n"); 
    90 } 
    91  
    92 SYMBOL_EXPORT(dev_kfree_skb_any); 
    93  
    94 void* dev_alloc_skb(unsigned int length) 
    95 { 
    96         KePrint("dev_alloc_skb\n"); 
    97         return NULL; 
    98 } 
    99  
    100 SYMBOL_EXPORT(dev_alloc_skb); 
     202SYMBOL_EXPORT(__vlan_hwaccel_rx); 
  • Whitix/branches/netchannel/devices/linux/pci.c

    r1889 r2061  
    77#include "include/pci.h" 
    88 
    9 int pci_choose_state(void* dev, unsigned int state) 
    10 { 
    11         KePrint("pci_choose_state(%#X)\n", dev); 
    12         return 0; 
    13 } 
     9/* 
    1410 
    15 SYMBOL_EXPORT(pci_choose_state); 
     11         U pci_disable_msi 
     12         U pci_enable_device 
     13         U pci_enable_device_mem 
     14         U pci_enable_msi 
     15         U pci_find_capability 
     16         U pci_release_selected_regions 
     17         U pci_request_selected_regions 
     18         U pci_restore_state 
     19         U pci_save_state 
     20         U pci_select_bars 
     21         U pci_set_consistent_dma_mask 
     22         U pci_set_dma_mask 
     23         U pci_set_mwi 
     24         U pcix_get_mmrbc 
     25         U pcix_set_mmrbc 
     26 
     27*/ 
    1628 
    1729int pci_set_power_state(void* dev, int num) 
     
    4961int quickcall pci_enable_device(struct pci_device* dev) 
    5062{ 
    51         return PciEnableDevice(dev->data); 
     63        return PciEnableDevice(PCI_TODEV(dev)); 
    5264} 
    5365 
     
    6375void quickcall pci_set_master(struct pci_device* dev) 
    6476{ 
    65         PciSetMaster(dev->data); 
     77        PciSetMaster(PCI_TODEV(dev)); 
    6678} 
    6779 
     
    7082int LinuxPciInitOne(struct PciDevice* device, struct PciDeviceId* devId) 
    7183{ 
    72         struct PciDriver* pciDriver = device->driver; 
     84        struct PciDriver* pciDriver = device->driver;    
    7385        struct pci_driver* driver = (struct pci_driver*)pciDriver->data; 
     86 
    7487        struct pci_device* dev = (struct pci_device*)MemAlloc(sizeof(struct pci_device)); 
    7588        int i; 
     89                 
     90        for (i=0; i<6; i++) 
     91                dev->resources[i].start = device->spaces[i] & ~0xF; 
    7692         
    77         for (i=0; i<6; i++) 
    78         { 
    79                 dev->resources[i].start = device->spaces[i] & ~0xF; 
    80                 KePrint("start = %#X\n", dev->resources[i].start); 
    81         } 
     93        dev->irq = device->irq; 
    8294         
    83         KePrint("resources offset = %#X\n", OffsetOf(struct pci_device, resources[0].start)); 
    84         KePrint("[0].start = %#X\n", dev->resources[0].start); 
    85          
    86         KePrint("val = %#X\n", *(DWORD*)((char*)dev+0x194)); 
    87          
    88         dev->data = device; 
     95        dev->dev.devP = device; 
    8996         
    9097        return driver->probe(dev, devId); 
     
    108115SYMBOL_EXPORT(__pci_register_driver); 
    109116 
     117quickcall int pci_bus_read_config_word(void* bus, unsigned int devfn, int where, WORD* val) 
     118{ 
     119        KePrint("pci_bus_read_config_word\n"); 
     120        return 0; 
     121} 
     122 
     123SYMBOL_EXPORT(pci_bus_read_config_word); 
     124 
     125quickcall DWORD pci_choose_state(void* dev, DWORD state) 
     126{ 
     127        KePrint("pci_choose_state\n"); 
     128        return 0; 
     129} 
     130 
     131SYMBOL_EXPORT(pci_choose_state); 
     132 
     133quickcall void pci_clear_mwi(void* dev) 
     134{ 
     135        KePrint("pci_clear_mwi\n"); 
     136} 
     137 
     138SYMBOL_EXPORT(pci_clear_mwi); 
     139 
    110140void pci_unregister_driver(void* dev) 
    111141{ 
  • Whitix/branches/netchannel/devices/linux/resource.c

    r1889 r2061  
    33#include <print.h> 
    44 
    5 void* __request_region(void* parent, unsigned long start, unsigned long n, char* name) 
     5#include "include/module.h" 
     6 
     7quickcall void* __request_region(void* parent, unsigned long start, unsigned long n, char* name) 
    68{ 
    7         KePrint("__request_region\n"); 
    89        return 0xDEADCAFE; 
    910} 
     
    1112SYMBOL_EXPORT(__request_region); 
    1213 
    13 void __release_region(void* parent, unsigned long start, unsigned long n) 
     14quickcall void __release_region(void* parent, unsigned long start, unsigned long n) 
    1415{ 
    1516        KePrint("__release_region\n"); 
  • Whitix/branches/netchannel/devices/linux/timer.c

    r1889 r2061  
    22#include <module.h> 
    33#include <print.h> 
     4#include <timer.h> 
    45 
    5 void init_timer(void* timer) 
     6#include "include/module.h" 
     7 
     8quickcall void init_timer(struct Timer* timer) 
    69{ 
    7         KePrint("init_timer\n"); 
     10        KePrint("init_timer(%#X)\n", timer); 
     11//      KePrint("addr = %#X\n", *((DWORD*)0xC00a1588)); 
    812} 
    913 
     
    4852SYMBOL_EXPORT(__const_udelay); 
    4953 
     54void __udelay(unsigned int secs) 
     55{ 
     56        KePrint("__udelay\n"); 
     57} 
     58 
     59SYMBOL_EXPORT(__udelay); 
     60 
    5061void mcount() 
    5162{ 
  • Whitix/branches/netchannel/devices/net/pcnet.c

    r1740 r2061  
    3030 
    3131/* Resonable default values are 4 send buffers, and 16 receive uffers. */ 
    32 #define PCNET32_LOG_SEND_BUFFERS                4 
    33 #define PCNET32_LOG_RECV_BUFFERS                5 
    34  
    35 #define PCNET32_SEND_RING_SIZE                  (1 << (PCNET32_LOG_SEND_BUFFERS)) 
    36 #define PCNET32_RECV_RING_SIZE                  (1 << (PCNET32_LOG_RECV_BUFFERS)) 
     32#define PCNET_LOG_SEND_BUFFERS          4 
     33#define PCNET_LOG_RECV_BUFFERS          5 
     34 
     35#define PCNET_SEND_RING_SIZE                    (1 << (PCNET_LOG_SEND_BUFFERS)) 
     36#define PCNET_RECV_RING_SIZE                    (1 << (PCNET_LOG_RECV_BUFFERS)) 
    3737 
    3838/* Structures */ 
     
    4444        WORD reserved; 
    4545        DWORD filter[2]; 
    46         DWORD rxRing; 
    47         DWORD txRing; 
     46        DWORD recvRing; 
     47        DWORD sendRing; 
    4848}; 
    4949 
     
    7979        struct PcNetInitBlock* initBlock; 
    8080        DWORD dmaAddr; 
     81        DWORD sendRingAddr, sendRingDmaAddr; 
     82        DWORD recvRingAddr, recvRingDmaAddr; 
    8183        struct PcNetIoOps* ops; 
    8284        DWORD ioAddr; 
     
    166168} 
    167169 
    168 static int PcNetAllocRings(struct PcNetDevice* device) 
     170static int PcNetAllocRings(struct PciDevice* pDev, struct PcNetDevice* device) 
    169171{ 
    170172        /* Allocate the send and recv rings. */ 
     173        device->sendRingAddr = (DWORD)PciAllocConsistent(pDev, sizeof(struct PcNetSendHead)* 
     174                PCNET_SEND_RING_SIZE, &device->sendRingDmaAddr); 
     175                 
     176        /* TODO: Check! */ 
     177         
     178        device->recvRingAddr = (DWORD)PciAllocConsistent(pDev, sizeof(struct PcNetRecvHead)* 
     179                PCNET_RECV_RING_SIZE, &device->recvRingDmaAddr); 
     180         
     181        return 0; 
     182} 
     183 
     184static int PcNetOpen(struct NetDevice* dev) 
     185{ 
     186        struct PcNetDevice* pcDev = NetDevPriv(dev); 
     187         
    171188        return 0; 
    172189} 
     
    177194        struct PcNetIoOps* ops; 
    178195        struct PcNetDevice* ret; 
     196        struct NetDevice* netDev; 
     197        struct EthDevice* ethDev; 
    179198        char* chipName; 
    180199        BYTE macAddr[6]; 
     
    185204        if (!ret) 
    186205                return NULL; 
     206                 
     207        netDev = NetDeviceAlloc(); 
     208         
     209        /* TODO: Check */ 
     210         
     211//      netDev->ops = &pcNetOps; 
     212        netDev->priv = ret; 
     213         
     214        ethDev=EthDeviceAlloc(netDev); 
     215        netDev->procPriv = ethDev; 
    187216                 
    188217        /* Fill out the fields we need to scan the device. */ 
     
    224253        ret->ops = ops; 
    225254         
     255        if (PcNetAllocRings(device, ret)) 
     256        { 
     257                /* Failure to allocate rings. */ 
     258        } 
     259         
    226260        PcNetReadMacAddress(ops, ioAddr, macAddr); 
    227261        EthPrintMacAddress(macAddr); 
     
    237271        for (i = 0; i < 6; i++) 
    238272                ret->initBlock->macAddr[i] = macAddr[i]; 
     273                 
     274        ret->initBlock->sendRing = ret->sendRingDmaAddr; 
     275        ret->initBlock->recvRing = ret->recvRingDmaAddr; 
    239276         
    240277        /* Switch the PcNet to 32-bit mode and start the transfer. */ 
     
    247284        /* Enable LED writes. */ 
    248285        ops->writeBcr(ioAddr, 2, ops->readBcr(ioAddr, 2) | 0x1000); 
     286         
     287        PcNetOpen(netDev); 
    249288         
    250289        return 0; 
  • Whitix/branches/netchannel/devices/pci/pci_core.c

    r1685 r2061  
    263263{ 
    264264        struct PciDeviceId* currId; 
     265        int ret; 
    265266 
    266267        /* Search through each device id entry, looking for a match. */ 
     
    276277                { 
    277278                        if (driver->initOne) 
    278                                 /* Matched! Start up the device. */ 
    279                                 return driver->initOne(device, currId); 
     279                        { 
     280                                device->driver = driver; 
     281                                 
     282                                ret = driver->initOne(device, currId); 
     283                                 
     284                                if (ret) 
     285                                        device->driver = NULL; 
     286                                         
     287                                return ret; 
     288                        } 
    280289                } 
    281290 
  • Whitix/branches/netchannel/include/module.h

    r1660 r2061  
    2525#define MODULE_START    0xD8000000 
    2626#define MODULE_END              0xE0000000 
     27 
     28#define MODULE_FLAG_LINUX       0x01 
    2729 
    2830#ifndef MODULE /* Kernel-specific structures. */ 
     
    5456        struct ElfSymbol* symTable; 
    5557        int symTableSize; 
     58        int flags; 
    5659}; 
    5760 
  • Whitix/branches/netchannel/include/net/buffer.h

    r1439 r2061  
    22#define NET_BUFFER_H 
    33 
     4#include <error.h> 
    45#include <malloc.h> 
     6#include <typedefs.h> 
     7#include <string.h> 
     8#include <llist.h> 
     9 
     10struct NetDevice; 
    511 
    612struct NetBuffer 
    713{ 
    8         char* data; 
     14        struct ListHead next; 
     15        unsigned char* start, *data; 
     16        int type; 
    917        unsigned int length; 
     18        struct NetDevice* device; 
    1019}; 
    1120 
    12 struct NetBuffer* NetAllocRecvBuffer(unsigned int length) 
     21static inline int NetBufferSkip(struct NetBuffer* buffer, unsigned int bytes) 
     22{ 
     23        if (bytes > buffer->length) 
     24                return -EINVAL; 
     25                 
     26        buffer->data += bytes; 
     27        buffer->length -= bytes; 
     28         
     29        return 0; 
     30} 
     31 
     32static inline int NetBufferPush(struct NetBuffer* buffer, unsigned int bytes) 
     33{ 
     34        buffer->data += bytes; 
     35         
     36        return 0; 
     37} 
     38 
     39static inline int NetBufferCanRead(struct NetBuffer* buffer, unsigned int bytes) 
     40{ 
     41        return (buffer->length < bytes); 
     42} 
     43 
     44static inline int NetBufferNoMore(struct NetBuffer* buffer) 
     45{ 
     46        return (buffer->length == 0); 
     47} 
     48 
     49static inline unsigned int NetBufferCopy(BYTE* data, struct NetBuffer* buffer, unsigned int length) 
     50{ 
     51        unsigned int copyLength; 
     52         
     53        copyLength = MIN(length, buffer->length); 
     54        memcpy(data, buffer->data, copyLength); 
     55        NetBufferSkip(buffer, copyLength); 
     56         
     57        return copyLength; 
     58} 
     59 
     60static inline struct NetBuffer* NetAllocRecvBuffer(unsigned int length) 
    1361{ 
    1462        struct NetBuffer* ret = (struct NetBuffer*)MemAlloc(sizeof(struct NetBuffer)); 
    1563         
    1664        ret->length = length; 
    17         ret->data = (char*)MemAlloc(length); 
     65        ret->data = ret->start = (unsigned char*)MemAlloc(length); 
    1866         
    1967        return ret; 
    2068} 
    2169 
     70static inline struct NetBuffer* NetAllocSendBuffer(void* data, unsigned int length) 
     71{ 
     72        struct NetBuffer* ret = (struct NetBuffer*)MemAlloc(sizeof(struct NetBuffer)); 
     73         
     74        ret->length = length; 
     75        ret->data = ret->start = data; 
     76         
     77        return ret; 
     78} 
     79 
     80static inline struct NetBuffer* NetAllocBuffer(unsigned int length) 
     81{ 
     82        struct NetBuffer* ret = (struct NetBuffer*)MemAlloc(sizeof(struct NetBuffer)); 
     83         
     84        ret->length = length; 
     85        ret->data = ret->start = (unsigned char*)MemAlloc(length); 
     86         
     87        return ret;      
     88} 
     89 
     90static inline void NetFreeBuffer(struct NetBuffer* buffer) 
     91{ 
     92        MemFree(buffer->start); 
     93        MemFree(buffer); 
     94} 
     95 
     96struct NetDevice; 
     97 
    2298int NetRecv(struct NetBuffer* buffer); 
    2399 
  • Whitix/branches/netchannel/include/net/channels.h

    r1429 r2061  
    2020#define CHANNELS_H 
    2121 
     22#include <spinlock.h> 
     23#include <llist.h> 
     24#include <net/buffer.h> 
    2225#include <typedefs.h> 
     26#include <i386/i386.h> 
     27#include <wait.h> 
     28 
     29struct ChannelHead; 
     30 
     31struct ChannelAddr 
     32{ 
     33        unsigned char data[20]; 
     34}PACKED; 
     35 
     36/* Channel types. */ 
     37#define CHANNEL_IP              0x00 
     38 
     39#define CHANNEL_MAX     1 
    2340 
    2441/* struct Channel 
     
    3350struct Channel 
    3451{ 
    35         unsigned short type; 
    36         unsigned short flags; 
     52        unsigned short family, type; 
     53        unsigned int flags; 
    3754 
    38         unsigned char srcAddr[12]; 
    39         unsigned char destAddr[12]; 
     55        struct ChannelAddr srcAddr, destAddr; 
    4056 
    41         /* Used by routing code (for network channels, Ethernet or 802.11) to store 
    42          * channel-specific data. */ 
    43         void* routeInfo; 
     57        /* Copying data. */ 
     58        struct ChanMasterPage* masterPage; 
     59        unsigned int pos, lastRead; 
     60        WaitQueue waitQueue; 
     61         
     62        struct ListHead next; 
    4463}; 
    4564 
     65struct ChannelOps 
     66{ 
     67        struct ChannelHead* (*create)(struct Channel* channel); 
     68        int (*control)(struct Channel* channel, int code, void* data); 
     69        int (*write)(struct Channel* channel, void* data, unsigned int length); 
     70        int (*recvBuffer)(struct NetBuffer* buffer); 
     71        int (*close)(struct Channel* channel); 
     72}; 
     73 
     74#define CHANNEL_NUM_PER_PAGE    (PAGE_SIZE/sizeof(void*)) 
     75#define CHANNEL_MAX_ITER        10 
     76 
     77/* One for sending, and one for recieving? */ 
     78struct ChanMasterPage 
     79{ 
     80        void* pages[CHANNEL_NUM_PER_PAGE]; 
     81}; 
     82 
     83struct ChannelHead 
     84{ 
     85        Spinlock lock; 
     86        struct ListHead head; 
     87}; 
     88 
     89typedef int (*ChanCompareFunc)(struct Channel*, struct ChannelAddr*, struct ChannelAddr*); 
     90 
     91static inline struct Channel* ChannelSearchList(struct ChannelHead* head, 
     92        ChanCompareFunc compare, 
     93        struct ChannelAddr* src, struct ChannelAddr* dest) 
     94{ 
     95        struct Channel* curr, *ret = NULL; 
     96         
     97        ListForEachEntry(curr, &head->head, next) 
     98        { 
     99                if (compare(curr, src, dest) == 0) 
     100                { 
     101                        ret = curr; 
     102                        break; 
     103                } 
     104        } 
     105                 
     106        return ret; 
     107} 
     108 
     109/* Flags */ 
     110 
     111#define CHANNEL_IGNORE_ADDRESSES        0x01 
     112 
     113/* ChannelControl flags */ 
     114#define CHANNEL_SET_FLAGS               0x01 
     115#define CHANNEL_SET_DLINK               0x02 
     116 
    46117#endif 
  • Whitix/branches/netchannel/include/pci.h

    r1714 r2061  
    4040        WORD subVendor, subDevice; 
    4141        DWORD spaces[6]; /* I/O or memory space */ 
     42         
     43        struct PciDriver* driver; 
    4244        void* driverData; 
    4345 
     
    6567#define PCI_SUBSYS_VENDOR_ID 0x2C 
    6668#define PCI_SUBSYS_ID           0x2E 
     69#define PCI_INTERRUPT_PIN       0x3D 
    6770 
    6871extern int (*PciRead)(int bus, int dev, int func, int reg, int bytes, DWORD* val); 
     
    8386 
    8487#define PCI_ID_ANY      (DWORD)(~0)     /* Used if the driver doesn't care about a certain ID field. */ 
     88 
     89#define PciIdTableEnd() {0, 0, 0, 0, 0, 0, NULL} 
    8590 
    8691struct PciDeviceId 
     
    106111        /* Internal data */ 
    107112        struct ListHead next; 
     113        void* data; 
    108114}; 
    109115 
     
    111117int PciEnableDevice(struct PciDevice* device); 
    112118int PciRegisterDriver(struct PciDriver* pciDriver); 
    113 int PciResourceStart(struct PciDevice* device, int index); 
    114119int PciWriteConfigByte(struct PciDevice* device, int reg, BYTE value); 
    115120int PciReadConfigByte(struct PciDevice* device, int reg, BYTE* value); 
    116121int PciReadConfigWord(struct PciDevice* device, int reg, WORD* value); 
     122int PciReadConfigDword(struct PciDevice* device, int reg, DWORD* value); 
     123int PciWriteConfigDword(struct PciDevice* device, int reg, DWORD value); 
     124 
    117125int PciSetMaster(struct PciDevice* device); 
    118126 
  • Whitix/branches/netchannel/include/timer.h

    r608 r2061  
    2424struct Timer 
    2525{ 
     26        struct ListHead list; 
     27        int expires; /* in ms */ 
    2628        void (*func)(void* data); 
    2729        void* data; 
    28         int expires; /* in ms */ 
    29         struct ListHead list; 
     30        void* timerLevel; 
    3031}; 
    3132 
  • Whitix/branches/netchannel/kernel/module.c

    r1677 r2061  
    3535Spinlock moduleListLock; 
    3636 
     37#define MODULE_LINUX_VERSION    "2.6.28-11-generic" 
     38 
    3739void* ModuleSymbolFind(struct Module* module, const char* symName, int type) 
    3840{ 
     
    145147        ListForEachEntry(curr, &moduleList, next) 
    146148        { 
     149                int i = 0; 
     150                 
    147151                if (!curr->keSymTab) 
    148152                        continue; 
    149153 
    150154                currSym=(struct KernelSymbol*)(curr->keSymTab); 
    151                 int i=0; 
     155                 
     156                if (curr->flags & MODULE_FLAG_LINUX) 
     157                        continue; 
    152158 
    153159                while (i < curr->keSymTabSize) 
     
    160166 
    161167                        currSym++; 
    162                         i+=sizeof(struct KernelSymbol); 
     168                        i += sizeof(struct KernelSymbol); 
    163169                } 
    164170        } 
     
    284290        } 
    285291 
     292        return NULL; 
     293} 
     294 
     295static char* ModuleInfoNextString(char* p, unsigned int* size) 
     296{ 
     297        while (*p) 
     298        { 
     299                p++; 
     300                if ((*size)-- <= 1) 
     301                        return NULL; 
     302        } 
     303         
     304        while (!*p) 
     305        { 
     306                p++; 
     307                if ((*size)-- <= 1) 
     308                        return NULL; 
     309        } 
     310         
     311        return p; 
     312} 
     313 
     314/* Linux-specific functions */ 
     315static char* ModuleGetInfo(struct ElfSectionHeader* sectionHeaders, void* infoSec, unsigned int infoSize, const char* tag) 
     316{ 
     317        char* p; 
     318        unsigned int tagLen = strlen(tag); 
     319         
     320        if (infoSec == NULL) 
     321                return NULL; 
     322         
     323        for (p = (char*)infoSec; p; p = ModuleInfoNextString(p, &infoSize)) 
     324                if (!strncmp(p, tag, tagLen) && p[tagLen] == '=') 
     325                        return p + tagLen + 1; 
     326         
    286327        return NULL; 
    287328} 
     
    305346 
    306347        module->loadAddr=loadAddr; 
     348        module->flags = flags; 
    307349        module->sectionHeaders=sectionHeaders; 
    308350 
     
    374416        modInit=ModuleSymbolFind(module, "_ModuleInit", STT_FUNC); 
    375417 
     418        /* Support for Linux .ko modules. The module startup function can be found 
     419         * at init_module. */ 
     420          
     421        if (flags & MODULE_FLAG_LINUX) 
     422        { 
     423                char* verMagic; 
     424                void* infoAddr; 
     425                unsigned int infoSize; 
     426                 
     427                modInit = ModuleSymbolFind(module, "init_module", STT_FUNC); 
     428                 
     429                infoAddr = ModuleSectionFind(module, 
     430                        (char*)file+sectionHeaders[elfHeader->strTabSectionIndex].shOffset, 
     431                        ".modinfo", elfHeader->shEntries, &infoSize); 
     432                 
     433                if (infoAddr) 
     434                { 
     435                        /* Find the version string of the module, and make sure the module 
     436                         * is built to the kernel version we support. */ 
     437                        verMagic = ModuleGetInfo(elfHeader->shEntries, infoAddr, infoSize, "vermagic"); 
     438                 
     439                /* Version check */      
     440#if 0                    
     441                        if (strncmp(MODULE_LINUX_VERSION, verMagic, sizeof(MODULE_LINUX_VERSION))) 
     442                        { 
     443                                /* FIXME: Cleanup */ 
     444                                return -EINVAL; 
     445                        } 
     446#endif 
     447                } 
     448        } 
     449 
    376450        PreemptDisable(); 
    377451        ListAddTail(&module->next, &moduleList); 
     
    385459} 
    386460 
    387 int SysModuleAdd(void* data, unsigned long length); 
     461int SysModuleAdd(void* data, unsigned long length, int flags); 
    388462int SysModuleRemove(const char* name); 
    389463 
    390464struct SysCall moduleSysCalls[]={ 
    391         SysEntry(SysModuleAdd, 8), 
     465        SysEntry(SysModuleAdd, 12), 
    392466        SysEntry(SysModuleRemove, 4), 
    393467        SysEntryEnd() 
     
    402476} 
    403477 
    404 int SysModuleAdd(void* data, unsigned long length) 
     478int SysModuleAdd(void* data, unsigned long length, int flags) 
    405479{ 
    406480        void* kData; 
     
    410484        kData=(void*)VirtMapPhysRange(MODULE_START, MODULE_END, PAGE_ALIGN_UP(length) >> PAGE_SHIFT, 3); 
    411485 
    412         ret=ModuleAdd(data, kData, length, 0); 
     486        ret=ModuleAdd(data, kData, length, flags); 
    413487 
    414488        return ret; 
  • Whitix/branches/netchannel/kernel/print.c

    r1890 r2061  
    5050         
    5151        length = vsnprintf(buf, CONSOLE_OUT_LEN, message, args); 
    52          
     52 
    5353        if (!length) 
    5454                return; 
    5555 
    5656        length = 0; 
    57  
     57         
    5858        for (start=buf; *start; start++) 
    5959        { 
     
    9191} 
    9292 
     93SYMBOL_EXPORT(KeVaPrint); 
     94 
    9395void KePrint(const char* message, ...) 
    9496{ 
  • Whitix/branches/netchannel/lib/string.c

    r1720 r2061  
    3636int strncmp(const char* s1,const char* s2,int num) 
    3737{ 
    38         unsigned char res=0; 
     38        unsigned char res = 0; 
    3939 
    4040    while (num) 
     
    197197 
    198198SYMBOL_EXPORT(strdup); 
     199 
     200/* strcpy - mainly for use by Linux drivers; not recommended. */ 
     201 
     202char* strcpy(char* dest, const char* src) 
     203{ 
     204        char* save = dest; 
     205         
     206        while (*src != '\0') 
     207                *dest++ = *src++; 
     208                 
     209        *dest='\0'; 
     210         
     211        return save; 
     212} 
     213 
     214SYMBOL_EXPORT(strcpy); 
     215 
     216unsigned long strlcpy(char* dest, char* src, unsigned long size) 
     217{ 
     218        unsigned long ret = strlen(src); 
     219         
     220        if (size) 
     221        { 
     222                unsigned long len = (ret >= size) ? size - 1 : ret; 
     223                memcpy(dest, src, len); 
     224                dest[len] = '\0'; 
     225        } 
     226         
     227        return ret; 
     228} 
     229 
     230SYMBOL_EXPORT(strlcpy); 
  • Whitix/branches/netchannel/lib/vsprintf.c

    r1720 r2061  
    395395 
    396396SYMBOL_EXPORT(vasprintf); 
     397 
     398/* sprintf, used by Linux drivers mostly. */ 
     399int sprintf(char* str, const char* fmt, ...) 
     400{ 
     401        KePrint("sprintf"); 
     402        return 0; 
     403} 
     404 
     405SYMBOL_EXPORT(sprintf); 
     406 
     407int scnprintf(char* buf, unsigned long size, const char* fmt, ...) 
     408{ 
     409        VaList args; 
     410        int i; 
     411         
     412        VaStart(args, fmt); 
     413        i = vsnprintf(buf, size, fmt, args); 
     414        VaEnd(args); 
     415         
     416        return (i >= size) ? (size-1) : i; 
     417} 
     418 
     419SYMBOL_EXPORT(scnprintf); 
  • Whitix/branches/netchannel/make.inc

    r1210 r2061  
    1414LD_R_FLAGS = -r -melf_i386 
    1515 
     16MAKEFLAGS += --no-print-directory 
     17 
    1618# Build the dependency list 
    1719DEPS := $(MODULES:%.sys=.deps/%.d) 
     
    1921 
    2022%.o : %.c 
    21 #       @echo "CC $*.c" 
    22         $(CC) $(CFLAGS) -c $*.c -o $*.o 
     23        @echo "CC $*.c" 
     24        @$(CC) $(CFLAGS) -c $*.c -o $*.o 
    2325        @$(CC) -MM $(CFLAGS) -c $*.c > .deps/$*.d 
    2426 
    2527%.sys : %.c 
    26 #       @echo "CC $*.c" 
    27         $(CC) $(CFLAGS) -DMODULE -fno-common -c $*.c -o $*.sys 
     28        @echo "CC $*.c (M)" 
     29        @$(CC) $(CFLAGS) -DMODULE -fno-common -c $*.c -o $*.sys 
    2830        @$(CC) -MM $(CFLAGS) -DMODULE -c $*.c > .deps/$*.d 
    29         $(SED) -i "s/$*.o/$*.sys/" .deps/$*.d 
     31        @$(SED) -i "s/$*.o/$*.sys/" .deps/$*.d 
    3032 
    3133#gas assembly files 
  • Whitix/branches/netchannel/memory/Makefile

    r882 r2061  
    11DEPTH=../ 
    2 OBJS = pg_alloc.o slab.o vmm.o mmap.o 
    3 MODULES = shmem.sys 
     2OBJS = pg_alloc.o slab.o vmm.o mmap.o shmem.o 
    43 
    5 build: $(OBJS) $(MODULES) 
    6  
    7 modules_install: 
    8         cp *.sys ../CdRoot/System/Modules/Core 
     4build: $(OBJS) 
    95 
    106include $(DEPTH)make.inc 
  • Whitix/branches/netchannel/memory/mmap.c

    r1418 r2061  
    211211static void MMapAddArea(struct Process* process, struct VMArea* area) 
    212212{ 
     213        SpinLock(&process->areaLock); 
     214         
    213215        if (ListEmpty(&process->areaList)) 
    214216                ListAdd(&area->list,&process->areaList); 
     
    225227                DoListAdd(&area->list,curr->list.prev,&curr->list); 
    226228        } 
     229         
     230        SpinUnlock(&process->areaLock); 
    227231} 
    228232 
     
    263267void MMapFreePage(struct VMArea* area, DWORD virt) 
    264268{ 
    265         struct PhysPage* page; 
     269//      struct PhysPage* page; 
    266270 
    267271        if (PAGE_IS_PRESENT(virt)) 
     
    342346        length=PAGE_ALIGN_UP(length); 
    343347 
     348        SpinLock(&process->areaLock); 
     349 
    344350        ListForEachEntry(curr,&process->areaList,list) 
    345351        { 
     
    347353 
    348354                if (mapStart <= mapEnd && (mapEnd-mapStart) >= length) 
    349                         return mapStart; 
     355                        goto out; 
    350356 
    351357                mapStart=curr->start+PAGE_ALIGN_UP(curr->length); 
     
    354360        /* Got to the end, and found no suitable area */ 
    355361        if (UNLIKELY(mapStart == MMAP_END)) 
    356                 return 0; 
    357  
     362                mapStart = 0; 
     363 
     364out: 
     365        SpinUnlock(&process->areaLock); 
    358366        return mapStart; 
    359367} 
     
    481489        area->flags=flags; 
    482490        area->areaOps=ops; 
    483  
     491         
    484492        MMapUnmap(process, address, length);     
    485493 
     
    560568        if (!area) 
    561569                return -EFAULT; 
    562                  
     570 
    563571        end = start + len; 
    564572         
    565573        if (area->start >= end) 
    566574                return 0; 
     575                 
     576        SpinLock(&process->areaLock); 
    567577 
    568578        while (currLen) 
     
    591601 
    592602error: 
     603        SpinUnlock(&process->areaLock); 
     604         
    593605        return err; 
    594606} 
     
    616628        struct VNode* vNode=NULL; 
    617629         
    618 //      KePrint("SysMemoryMap(%#X, %#X, %d, %d, %#X)\n", address, length, protection, fd, offset); 
    619          
    620630        if (fd != -1 && !(file=FileGet(fd))) 
    621631                return 0; 
     
    774784{ 
    775785        VmInit(); 
     786        ShMemInit(); 
    776787        SysRegisterRange(SYS_MMAP_BASE, mmapSysCalls); 
    777788        return 0; 
  • Whitix/branches/netchannel/memory/shmem.c

    r882 r2061  
    208208        return 0; 
    209209} 
    210  
    211 ModuleInit(ShMemInit); 
  • Whitix/branches/netchannel/net/Makefile

    r1414 r2061  
    11DEPTH=../ 
    2 OBJS = channels.o network.o device.o eth.o 
     2OBJS =  network.o device.o eth.o 
     3IGNORE_CLEAN = y 
    34 
    45build: $(OBJS) 
     6        make -C ipv4 
     7        make -C channels 
     8 
     9modules_install: 
     10        make -C ipv4 modules_install 
     11 
     12clean: 
     13        rm -f *.o .deps/*.d 
     14        make -C ipv4 clean 
     15        make -C channels clean 
    516 
    617include $(DEPTH)make.inc 
  • Whitix/branches/netchannel/net/device.c

    r974 r2061  
    1717 */ 
    1818 
     19#include <net/device.h> 
    1920#include <module.h> 
    2021#include <net/network.h> 
     22#include <devices/class.h> 
     23#include <keobject.h> 
    2124#include <slab.h> 
     25#include <fs/devfs.h> 
    2226 
    2327struct Cache* netDeviceCache; 
    2428 
    2529/* Only one device for now! TODO: Add support for multiple devices. */ 
    26 struct NetDevice* currDevice; 
     30struct NetDevice* currDevice = NULL; 
     31 
     32struct DevClass networkClass; 
     33 
     34/* For now */ 
     35SYMBOL_EXPORT(currDevice); 
    2736 
    2837struct NetDevice* NetDeviceAlloc() 
     
    3645{ 
    3746        currDevice=device; 
     47         
     48        KeDeviceInit(&device->device, &networkClass.set, 0, NULL, DEVICE_CHAR); 
     49                 
     50        KeDeviceAttach(&device->device, "Ethernet0");    
     51         
    3852        return 0; 
    3953} 
     
    4155SYMBOL_EXPORT(NetDeviceRegister); 
    4256 
     57int NetDeviceSend(struct NetDevice* device, struct NetBuffer* buffer) 
     58{ 
     59        if (!device->ops || !device->ops->send) 
     60                return -ENOTIMPL; 
     61         
     62//      if (device-> state & NET_DEVICE_QUEUE_RUNNING) 
     63                return device->ops->send(device, buffer); 
     64//      else{ 
     65                /* Add the packet onto the queue, and wait for the device to pick 
     66                 * it up once it has finished an event like a send interrupt. 
     67                 */ 
     68//              ListAddTail(&buffer->next, &device->sendList); 
     69//      } 
     70} 
     71 
     72SYMBOL_EXPORT(NetDeviceSend); 
     73 
    4374int NetDeviceInit() 
    4475{ 
    4576        netDeviceCache=MemCacheCreate("Network device cache", sizeof(struct NetDevice), NULL, NULL, 0); 
     77         
     78        DevClassCreate(&networkClass, NULL, "Network"); 
     79         
    4680        return 0; 
    4781} 
  • Whitix/branches/netchannel/net/eth.c

    r974 r2061  
    1717 */ 
    1818 
     19#include <net/device.h> 
     20#include <net/byteswap.h> 
    1921#include <net/eth.h> 
    2022#include <module.h> 
    2123#include <slab.h> 
     24#include <fs/vfs.h> 
     25#include <fs/icfs.h> 
    2226 
    2327struct Cache* ethDeviceCache; 
     
    2529struct EthDevice* EthDeviceAlloc(struct NetDevice* netDev) 
    2630{ 
    27         return MemCacheAlloc(ethDeviceCache); 
     31        struct EthDevice* ret; 
     32         
     33        ret = MemCacheAlloc(ethDeviceCache); 
     34         
     35        ret->dev = netDev; 
     36         
     37        return ret; 
    2838} 
    2939 
     
    3242int EthDeviceRegister(struct EthDevice* device) 
    3343{ 
    34         return 0; 
     44        int ret; 
     45        struct KeFsEntry* dir; 
     46         
     47        ret = NetDeviceRegister(device->dev); 
     48         
     49        if (ret) 
     50                return ret; 
     51         
     52        /* TODO: Use proper IcFs attributes. */ 
     53        dir = KeDeviceGetConfDir(&device->dev->device); 
     54                 
     55        /* TODO: Change to array entry. */ 
     56        IcFsAddStrEntry(dir, "macAddress", device->macAddress, VFS_ATTR_READ | VFS_ATTR_WRITE); 
     57        IcFsAddIntEntry(dir, "netAddress", (int*)&device->dev->netAddress, VFS_ATTR_READ | VFS_ATTR_WRITE); 
     58 
     59        /* Set Ethernet-specific information */ 
     60        device->dev->headerLen = sizeof(struct EthHeader); 
     61        device->dev->addressLen = sizeof(EthMac); 
     62                 
     63        return 0;        
    3564} 
    3665 
     
    4473SYMBOL_EXPORT(EthSetAddress); 
    4574 
     75int EthRecv(struct EthDevice* device, struct NetBuffer* buffer) 
     76{ 
     77        /* Parse and remove the Ethernet header. */ 
     78        struct EthHeader* header; 
     79         
     80        if (NetBufferCanRead(buffer, sizeof(struct EthHeader))) 
     81                return 0; 
     82         
     83        header = (struct EthHeader*)(buffer->data); 
     84        buffer->type = NetToHostShort(header->type); 
     85        buffer->device = device->dev; 
     86 
     87        NetBufferSkip(buffer, sizeof(struct EthHeader)); 
     88         
     89        return NetRecv(buffer); 
     90} 
     91 
     92SYMBOL_EXPORT(EthRecv); 
     93 
     94int EthAddHeader(struct NetBuffer* buffer, unsigned char* srcAddr, unsigned char* dstAddr, unsigned short type) 
     95{ 
     96        struct EthHeader* header = (struct EthHeader*)(buffer->data); 
     97         
     98        /* TODO: Checks. */ 
     99         
     100        memcpy(&header->dest, dstAddr, 6); 
     101        memcpy(&header->src, srcAddr, 6); 
     102        buffer->type = type; 
     103        header->type = NetToHostShort(type); 
     104         
     105        NetBufferPush(buffer, sizeof(struct EthHeader)); 
     106         
     107        return 0; 
     108} 
     109 
     110SYMBOL_EXPORT(EthAddHeader); 
     111 
    46112int EthInit() 
    47113{ 
  • Whitix/branches/netchannel/net/network.c

    r1414 r2061  
    3737 
    3838int EthInit(); 
     39int NetDeviceInit(); 
    3940 
    4041int NetworkInit() 
    4142{ 
    4243        KePrint("NETWORK: Initialising network stack.\n"); 
     44 
     45        NetDeviceInit(); 
    4346 
    4447        EthInit(); 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-boot.Po

    r1359 r2061  
    1 libgrub_a-boot.o libgrub_a-boot.o: boot.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-boot.o: boot.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h freebsd.h imgact_aout.h i386-elf.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-builtins.Po

    r1359 r2061  
    1 libgrub_a-builtins.o libgrub_a-builtins.o: builtins.c \ 
    2   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-builtins.o: builtins.c /usr/include/stdio.h \ 
     2  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    33  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    44  /usr/include/gnu/stubs-32.h \ 
    5   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     5  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    66  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    77  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    8   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     8  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    99  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    10   /usr/include/bits/stdio.h shared.h ../config.h ../stage1/stage1.h \ 
    11   /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/unctrl.h \ 
    12   /usr/include/curses.h \ 
    13   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     10  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h shared.h \ 
     11  ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
     12  /usr/include/ncurses_dll.h /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1414  mb_info.h filesys.h pc_slice.h term.h serial.h terminfo.h \ 
    1515  ../lib/device.h md5.h 
     
    2727/usr/include/gnu/stubs-32.h: 
    2828 
    29 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     29/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3030 
    3131/usr/include/bits/types.h: 
     
    3939/usr/include/wchar.h: 
    4040 
    41 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     41/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    4242 
    4343/usr/include/bits/stdio_lim.h: 
     
    4646 
    4747/usr/include/bits/stdio.h: 
     48 
     49/usr/include/bits/stdio2.h: 
    4850 
    4951shared.h: 
     
    6163/usr/include/curses.h: 
    6264 
    63 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     65/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6466 
    6567mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-char_io.Po

    r1359 r2061  
    1 libgrub_a-char_io.o libgrub_a-char_io.o: char_io.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-char_io.o: char_io.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h term.h hercules.h serial.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-cmdline.Po

    r1359 r2061  
    1 libgrub_a-cmdline.o libgrub_a-cmdline.o: cmdline.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-cmdline.o: cmdline.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-common.Po

    r1359 r2061  
    1 libgrub_a-common.o libgrub_a-common.o: common.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-common.o: common.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-disk_io.Po

    r1359 r2061  
    1 libgrub_a-disk_io.o libgrub_a-disk_io.o: disk_io.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-disk_io.o: disk_io.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h ../lib/device.h freebsd.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_ext2fs.Po

    r1359 r2061  
    1 libgrub_a-fsys_ext2fs.o libgrub_a-fsys_ext2fs.o: fsys_ext2fs.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_ext2fs.o: fsys_ext2fs.c shared.h ../config.h \ 
     2  ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
     3  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_fat.Po

    r1359 r2061  
    1 libgrub_a-fsys_fat.o libgrub_a-fsys_fat.o: fsys_fat.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_fat.o: fsys_fat.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h fat.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_ffs.Po

    r1359 r2061  
    1 libgrub_a-fsys_ffs.o libgrub_a-fsys_ffs.o: fsys_ffs.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_ffs.o: fsys_ffs.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h defs.h disk_inode.h disk_inode_ffs.h \ 
    1415  dir.h fs.h 
     
    3637/usr/include/gnu/stubs-32.h: 
    3738 
    38 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     39/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3940 
    4041/usr/include/bits/types.h: 
     
    4849/usr/include/wchar.h: 
    4950 
    50 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     51/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5152 
    5253/usr/include/bits/stdio_lim.h: 
     
    5657/usr/include/bits/stdio.h: 
    5758 
     59/usr/include/bits/stdio2.h: 
     60 
    5861/usr/include/unctrl.h: 
    5962 
    6063/usr/include/curses.h: 
    6164 
    62 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     65/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6366 
    6467mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_iso9660.Po

    r1359 r2061  
    1 libgrub_a-fsys_iso9660.o libgrub_a-fsys_iso9660.o: fsys_iso9660.c \ 
    2   shared.h ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_iso9660.o: fsys_iso9660.c shared.h ../config.h \ 
     2  ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
     3  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h iso9660.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_jfs.Po

    r1359 r2061  
    1 libgrub_a-fsys_jfs.o libgrub_a-fsys_jfs.o: fsys_jfs.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_jfs.o: fsys_jfs.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h jfs.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_minix.Po

    r1359 r2061  
    1 libgrub_a-fsys_minix.o libgrub_a-fsys_minix.o: fsys_minix.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_minix.o: fsys_minix.c shared.h ../config.h \ 
     2  ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
     3  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_reiserfs.Po

    r1359 r2061  
    1 libgrub_a-fsys_reiserfs.o libgrub_a-fsys_reiserfs.o: fsys_reiserfs.c \ 
    2   shared.h ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_reiserfs.o: fsys_reiserfs.c shared.h ../config.h \ 
     2  ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
     3  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_ufs2.Po

    r1359 r2061  
    1 libgrub_a-fsys_ufs2.o libgrub_a-fsys_ufs2.o: fsys_ufs2.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_ufs2.o: fsys_ufs2.c shared.h ../config.h \ 
     2  ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
     3  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h ufs2.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_vstafs.Po

    r1359 r2061  
    1 libgrub_a-fsys_vstafs.o libgrub_a-fsys_vstafs.o: fsys_vstafs.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_vstafs.o: fsys_vstafs.c shared.h ../config.h \ 
     2  ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
     3  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h vstafs.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-fsys_xfs.Po

    r1359 r2061  
    1 libgrub_a-fsys_xfs.o libgrub_a-fsys_xfs.o: fsys_xfs.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-fsys_xfs.o: fsys_xfs.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h xfs.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-gunzip.Po

    r1359 r2061  
    1 libgrub_a-gunzip.o libgrub_a-gunzip.o: gunzip.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-gunzip.o: gunzip.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h filesys.h pc_slice.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-md5.Po

    r1359 r2061  
    1 libgrub_a-md5.o libgrub_a-md5.o: md5.c md5.h shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-md5.o: md5.c md5.h shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h 
    1415 
     
    3738/usr/include/gnu/stubs-32.h: 
    3839 
    39 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     40/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    4041 
    4142/usr/include/bits/types.h: 
     
    4950/usr/include/wchar.h: 
    5051 
    51 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     52/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5253 
    5354/usr/include/bits/stdio_lim.h: 
     
    5758/usr/include/bits/stdio.h: 
    5859 
     60/usr/include/bits/stdio2.h: 
     61 
    5962/usr/include/unctrl.h: 
    6063 
    6164/usr/include/curses.h: 
    6265 
    63 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     66/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6467 
    6568mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-serial.Po

    r1359 r2061  
    1 libgrub_a-serial.o libgrub_a-serial.o: serial.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-serial.o: serial.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h serial.h term.h terminfo.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-stage2.Po

    r1359 r2061  
    1 libgrub_a-stage2.o libgrub_a-stage2.o: stage2.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-stage2.o: stage2.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h term.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-terminfo.Po

    r1359 r2061  
    1 libgrub_a-terminfo.o libgrub_a-terminfo.o: terminfo.c shared.h \ 
    2   ../config.h ../stage1/stage1.h /usr/include/ncurses.h \ 
    3   /usr/include/ncurses_dll.h /usr/include/stdio.h /usr/include/features.h \ 
    4   /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ 
    5   /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     1libgrub_a-terminfo.o: terminfo.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
     4  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
     5  /usr/include/gnu/stubs-32.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h terminfo.h tparm.h serial.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/grub/stage2/.deps/libgrub_a-tparm.Po

    r1359 r2061  
    1 libgrub_a-tparm.o libgrub_a-tparm.o: tparm.c shared.h ../config.h \ 
    2   ../stage1/stage1.h /usr/include/ncurses.h /usr/include/ncurses_dll.h \ 
    3   /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ 
     1libgrub_a-tparm.o: tparm.c shared.h ../config.h ../stage1/stage1.h \ 
     2  /usr/include/ncurses.h /usr/include/ncurses_dll.h /usr/include/stdio.h \ 
     3  /usr/include/features.h /usr/include/sys/cdefs.h \ 
    44  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ 
    55  /usr/include/gnu/stubs-32.h \ 
    6   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h \ 
     6  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h \ 
    77  /usr/include/bits/types.h /usr/include/bits/typesizes.h \ 
    88  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ 
    9   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h \ 
     9  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h \ 
    1010  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ 
    11   /usr/include/bits/stdio.h /usr/include/unctrl.h /usr/include/curses.h \ 
    12   /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h mb_header.h \ 
     11  /usr/include/bits/stdio.h /usr/include/bits/stdio2.h \ 
     12  /usr/include/unctrl.h /usr/include/curses.h \ 
     13  /usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h mb_header.h \ 
    1314  mb_info.h tparm.h 
    1415 
     
    3536/usr/include/gnu/stubs-32.h: 
    3637 
    37 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stddef.h: 
     38/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stddef.h: 
    3839 
    3940/usr/include/bits/types.h: 
     
    4748/usr/include/wchar.h: 
    4849 
    49 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdarg.h: 
     50/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdarg.h: 
    5051 
    5152/usr/include/bits/stdio_lim.h: 
     
    5556/usr/include/bits/stdio.h: 
    5657 
     58/usr/include/bits/stdio2.h: 
     59 
    5760/usr/include/unctrl.h: 
    5861 
    5962/usr/include/curses.h: 
    6063 
    61 /usr/lib/gcc/i486-linux-gnu/4.2.3/include/stdbool.h: 
     64/usr/lib/gcc/i486-linux-gnu/4.3.3/include/stdbool.h: 
    6265 
    6366mb_header.h: 
  • Whitix/branches/netchannel/user/libc/include/sysdefs.h

    r1433 r2061  
    2222SYSCALL(20, int, SysStat, 12, (char* path, void* stat, int fdAt) ); 
    2323SYSCALL(21, int, SysStatFd, 8, (int fd, void* stat) ); 
    24 SYSCALL(22,int,SysIoCtl,12,(int fd,unsigned long code,void* data)); 
     24SYSCALL(22,int,SysFileControl,12,(int fd,unsigned long code,void* data)); 
    2525SYSCALL(23,int,SysPoll,12,(void* fds, unsigned long numFds, int timeout)); 
    2626SYSCALL(24,int,SysPipe,4,(int* fds)); 
     
    6969 
    7070/* Module syscalls */ 
    71 SYSCALL(53, int, SysModuleAdd, 8, (void* data, unsigned int length)); 
     71SYSCALL(53, int, SysModuleAdd, 12, (void* data, unsigned int length, int flags)); 
    7272SYSCALL(54, int, SysModuleRemove, 4, (const char* name)); 
    7373 
     
    8080SYSCALL(58,int,SysIoAccess,4,(int on)); 
    8181 
    82 SYSCALL(59, int, SysChannelCreate, 12, (void* src, void* dest, int flags)); 
     82SYSCALL(59, int, SysChannelCreate, 16, (int family, void* src, void* dest, int flags)); 
    8383SYSCALL(60, int, SysChannelControl, 12, (int fd, unsigned long code, void* data)); 
  • Whitix/branches/netchannel/user/make.rules

    r709 r2061  
    11.c.o: 
    2         $(CC) $(CFLAGS) -c $*.c -o $*.o 
    3          
     2        @$(CC) $(CFLAGS) -c $*.c -o $*.o 
     3        @echo "CC $*.c"  
     4 
    45.S.o: 
    56        $(CC) $(ASFLAGS) -m32 -c $*.S -o $*.o 
  • Whitix/branches/netchannel/user/net/Makefile

    r1432 r2061  
    1 CFLAGS = -ffreestanding -fno-builtin -I../libc/include -I../sdk/include -fno-stack-protector -m32 -Wall -nostdinc 
     1CFLAGS = -ffreestanding -fno-builtin -I../libc/include -I../sdk/include \ 
     2        -fno-stack-protector -m32 -Wall -nostdinc 
    23 
    3 OBJS = channels.o 
     4OBJS = dhcp.o ping.o dns.o 
    45 
    56.c.o: 
     
    89build: $(OBJS) 
    910        gcc -m32 -nostdlib -L../libc -L../posix -L../sdk/libs \ 
    10         ../libc/init/init.o $(OBJS) -lstdc -lpthread -Wl,-I/System/Runtime/liblinker.so -o channels 
     11        ../libc/init/init.o dhcp.o -lstdc -lpthread -Wl,-I/System/Runtime/liblinker.so -o dhcp -lnetwork 
     12        gcc -m32 -nostdlib -L../libc -L../posix -L../sdk/libs \ 
     13        ../libc/init/init.o ping.o -lstdc -lpthread -Wl,-I/System/Runtime/liblinker.so -o ping -lnetwork 
     14        gcc -m32 -nostdlib -L../libc -L../posix -L../sdk/libs \ 
     15        ../libc/init/init.o dns.o -lstdc -lpthread -Wl,-I/System/Runtime/liblinker.so -o dns -lnetwork 
    1116         
    1217clean: 
    1318        rm -f *.o 
    14         rm -f channels 
     19        rm -f dhcp ping dns 
    1520 
    1621install: 
    17         cp channels ../../CdRoot/Applications 
     22        cp dhcp ping dns ../../CdRoot/Applications 
  • Whitix/branches/netchannel/user/posix/socket/socket.c

    r1374 r2061  
    99ssize_t send(int s, const void* buf, size_t len, int flags) 
    1010{ 
     11#if 0 
    1112        int ret=SysSocketSend(s, buf, len, flags); 
    1213 
     
    1819 
    1920        return ret; 
     21#endif 
     22        return -1; 
    2023} 
    2124 
    2225ssize_t recv(int s, void* buf, size_t len, int flags) 
    2326{ 
     27#if 0 
    2428        int ret=SysSocketReceive(s, buf, len, flags); 
    2529 
     
    3135 
    3236        return ret; 
     37#endif 
     38        return -1; 
    3339} 
    3440 
    3541int connect(int s, const struct sockaddr* serv_addr, socklen_t addrlen) 
    3642{ 
     43#if 0 
    3744        int ret=SysSocketConnect(s, serv_addr, addrlen); 
    3845 
     
    4451 
    4552        return ret; 
     53#endif 
     54        return -1; 
    4655} 
    4756 
    4857int socket(int domain, int type, int protocol) 
    4958{ 
    50         return SysSocketCreate(domain, type, protocol); 
     59//      return SysSocketCreate(domain, type, protocol); 
     60        return -1; 
    5161} 
    5262 
    5363int accept(int sockfd, struct sockaddr* addr, socklen_t *addrlen) 
    5464{ 
     65#if 0 
    5566        int ret=SysSocketAccept(sockfd, addr, addrlen); 
    5667 
     
    6273 
    6374        return ret; 
     75#endif 
     76        return -1; 
    6477} 
    6578 
    6679int bind(int s, const struct sockaddr* my_addr, socklen_t addr_len) 
    6780{ 
     81#if 0 
    6882        return SysSocketBind(s, my_addr, addr_len); 
     83#endif 
    6984} 
    7085 
    7186int shutdown(int s, int how) 
    7287{ 
     88#if 0 
    7389        return SysSocketClose(s); 
     90#endif 
    7491} 
    7592 
    7693int listen(int s, int backlog) 
    7794{ 
     95#if 0 
    7896        return SysSocketListen(s, backlog); 
     97#endif 
    7998} 
    8099 
  • Whitix/branches/netchannel/user/sdk/network/Makefile

    r910 r2061  
    11CFLAGS = -Wall -I../include -I../../libc/include -nostdlib -ffreestanding -fno-builtin -fPIC -m32 
    22 
    3 OBJS = socket.o 
     3OBJS = socket.o byteorder.o ipv4.o udp.o memory.o dns.o startup.o 
    44 
    55.c.o: 
     
    77 
    88build: $(OBJS) 
    9         gcc -m32 -nostdlib -ffreestanding -fno-builtin -shared -L../../libc -lstdc -o ../libs/libnetwork.so *.o ../../libc/init/crt_begin.o ../../libc/init/crt_end.o 
     9        gcc -m32 -nostdlib -ffreestanding -fno-builtin -shared -o ../libs/libnetwork.so \ 
     10                $(OBJS) ../../libc/init/crt_begin.o ../../libc/init/crt_end.o 
    1011 
    1112clean: 
  • Whitix/branches/netchannel/user/sdk/network/socket.c

    r1431 r2061  
    11/* Network and socket library. */ 
    2 #include <socket.h> 
     2#include <net/socket.h> 
    33#include <syscalls.h> 
    44 
  • Whitix/branches/netchannel/user/system/moduleadd.c

    r1104 r2061  
    55 
    66#define PATH_MAX        2048 
     7 
     8#define MODULE_FLAG_LINUX       0x01 
    79 
    810void UsagePrint() 
     
    1416} 
    1517 
    16 int ModuleLoad(char* name) 
     18int ModuleLoad(char* name, int flags) 
    1719{ 
    1820        /* Support multiple paths. */ 
     
    4143                return 1; 
    4244        } 
     45         
     46        ret=SysModuleAdd(address, size, flags); 
    4347 
    44         ret=SysModuleAdd(address, size); 
    45  
    46         SysMemoryUnmap(address, size); 
     48//      SysMemoryUnmap(address, size); 
    4749 
    4850        /* Check ret. */ 
     
    6971                strcpy(buf, moduleName); 
    7072 
    71         ret=ModuleLoad(buf); 
     73        ret=ModuleLoad(buf, 0); 
    7274 
    7375        if (ret == 1) 
     
    7678                strcpy(buf, "/System/Modules/Core/linux.sys"); 
    7779                 
    78                 ret=ModuleLoad(buf); 
     80                ret=ModuleLoad(buf, 0); 
    7981                 
    8082                if (!ret) 
    8183                { 
    8284                        sprintf(buf, "%s.ko", moduleName); 
    83                         ret=ModuleLoad(buf); 
     85                        ret=ModuleLoad(buf, MODULE_FLAG_LINUX); 
    8486                } 
    8587        } 
  • Whitix/branches/netchannel/user/system/registry/main.c

    r910 r2061  
    11#include <stdio.h> 
    2 #include <network.h> 
     2#include <net/network.h> 
    33#include <file.h> 
    44#include <syscalls.h> 
  • Whitix/branches/netchannel/user/system/registry/socket.c

    r910 r2061  
    1 #include <network.h> 
     1#include <net/network.h> 
    22#include <stdlib.h> 
    33#include <stdio.h> 
  • Whitix/branches/netchannel/user/system/startup.c

    r1415 r2061  
    3939        int ret, pid; 
    4040 
    41         pid = ModuleLoad("Core/pci"); 
     41        ModuleLoad("Network/ipv4"); 
     42        ModuleLoad("Network/ne2k_pci"); 
    4243 
    43         SysWaitForProcessFinish(pid, NULL); 
    44  
    45         ModuleLoad("Network/ne2k_pci"); 
     44        ModuleLoad("Network/pcnet32"); 
     45//      ModuleLoad("Network/e1000"); 
    4646         
    4747        /* Move to FS thread? */ 
    48         ModuleLoad("Filesystems/fatfs"); 
    4948        pid=ModuleLoad("Filesystems/icfs"); 
    5049         
     
    101100void UnixInit() 
    102101{ 
    103         ModuleLoad("Core/shmem"); 
    104102        ModuleLoad("Video/virtual"); 
    105103 
  • Whitix/branches/netchannel/user/xynth/demo/desktop/Makefile.depend

    r910 r2061  
    1010  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    1111  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     12  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    1213  ../../../posix/include/sys/unistd.h ../../src/lib/xynth_.h \ 
    1314  ../../../libc/include/errno.h ../../../libc/include/ctype.h \ 
     
    2627  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    2728  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     29  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    2830  ../../../posix/include/sys/unistd.h ../../src/lib/xynth_.h \ 
    2931  ../../../libc/include/errno.h ../../../libc/include/ctype.h \ 
     
    4244  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    4345  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     46  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    4447  ../../../posix/include/sys/unistd.h ../../src/lib/xynth_.h \ 
    4548  ../../../libc/include/errno.h ../../../libc/include/ctype.h \ 
     
    5861  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    5962  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     63  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    6064  ../../../posix/include/sys/unistd.h ../../src/lib/xynth_.h \ 
    6165  ../../../libc/include/errno.h ../../../libc/include/ctype.h \ 
  • Whitix/branches/netchannel/user/xynth/src/lib/Makefile.depend

    r921 r2061  
    88  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    99  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    10   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     10  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     11  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    1112  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    1213  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    2122  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    2223  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    23   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     24  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     25  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    2426  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    2527  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    3436  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    3537  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    36   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     38  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     39  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    3740  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    3841  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    4750  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    4851  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    49   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     52  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     53  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    5054  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    5155  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    6064  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    6165  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    62   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     66  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     67  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    6368  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    6469  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    7378  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    7479  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    75   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     80  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     81  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    7682  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    7783  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    8692  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    8793  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    88   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     94  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     95  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    8996  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    9097  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    99106  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    100107  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    101   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     108  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     109  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    102110  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    103111  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    124132  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    125133  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    126   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     134  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     135  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    127136  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    128137  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    137146  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    138147  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    139   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     148  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     149  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    140150  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    141151  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    150160  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    151161  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    152   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     162  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     163  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    153164  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    154165  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    163174  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    164175  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    165   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     176  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     177  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    166178  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    167179  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    176188  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    177189  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    178   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     190  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     191  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    179192  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    180193  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    189202  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    190203  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    191   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     204  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     205  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    192206  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    193207  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    202216  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    203217  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    204   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     218  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     219  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    205220  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    206221  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    215230  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    216231  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    217   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     232  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     233  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    218234  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    219235  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    229245  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    230246  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    231   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     247  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     248  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    232249  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    233250  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    242259  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    243260  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    244   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     261  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     262  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    245263  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    246264  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    255273  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    256274  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    257   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     275  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     276  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    258277  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    259278  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    268287  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    269288  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    270   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     289  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     290  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    271291  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    272292  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    281301  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    282302  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    283   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     303  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     304  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    284305  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    285306  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    294315  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    295316  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    296   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     317  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     318  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    297319  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    298320  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    307329  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    308330  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    309   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     331  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     332  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    310333  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    311334  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
    312335  ../../../posix/include/arpa/inet.h pixman/pixman.h pixman/config.h \ 
    313   ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    314336  pixman/pixman-remap.h 
    315337socket.o: socket.c xynth_.h ../../../libc/include/stdio.h \ 
     
    322344  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    323345  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    324   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     346  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     347  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    325348  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    326349  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    335358  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    336359  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    337   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     360  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     361  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    338362  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    339363  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    353377  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    354378  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     379  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    355380  ../../../libc/include/ctype.h xynth.h ../../../posix/include/sys/poll.h \ 
    356381  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    365390  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    366391  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    367   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     392  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     393  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    368394  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    369395  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    379405  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    380406  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    381   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     407  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     408  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    382409  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    383410  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    392419  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    393420  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    394   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     421  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     422  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    395423  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    396424  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
     
    405433  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    406434  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    407   ../../../posix/include/getopt.h ../../../libc/include/ctype.h xynth.h \ 
     435  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     436  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h xynth.h \ 
    408437  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
    409438  ../../../posix/include/sys/un.h ../../../posix/include/netinet/in.h \ 
  • Whitix/branches/netchannel/user/xynth/src/server/Makefile.depend

    r910 r2061  
    88  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    99  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    10   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     10  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     11  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    1112  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    1213  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    2223  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    2324  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    24   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     25  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     26  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    2527  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    2628  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    3638  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    3739  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    38   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     40  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     41  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    3942  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    4043  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    5154  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    5255  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    53   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     56  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     57  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    5458  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    5559  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    6670  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    6771  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    68   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     72  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     73  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    6974  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    7075  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    8186  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    8287  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    83   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     88  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     89  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    8490  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    8591  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    100106  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    101107  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     108  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    102109  ../../../libc/include/ctype.h ../lib/xynth.h \ 
    103110  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    113120  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    114121  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    115   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     122  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     123  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    116124  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    117125  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    128136  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    129137  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    130   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     138  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     139  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    131140  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    132141  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    142151  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    143152  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    144   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     153  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     154  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    145155  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    146156  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    156166  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    157167  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    158   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     168  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     169  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    159170  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    160171  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    171182  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    172183  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     184  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    173185  ../../../libc/include/ctype.h ../lib/xynth.h \ 
    174186  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    185197  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    186198  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     199  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    187200  ../../../libc/include/ctype.h ../lib/xynth.h \ 
    188201  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    199212  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    200213  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     214  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    201215  ../../../libc/include/ctype.h video/vga/../../../lib/xynth.h \ 
    202216  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    214228  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    215229  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    216   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     230  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     231  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    217232  video/bochs/../../../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    218233  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
  • Whitix/branches/netchannel/user/xynth/src/server/mouse.c

    r1100 r2061  
    413413                return -1; 
    414414 
    415         SysIoCtl(mouseFd, 0x80000000, 1); /* Non-blocking. */ 
     415        SysFileControl(mouseFd, 0x1, 1); /* Non-blocking. */ 
    416416 
    417417        return mouseFd; 
  • Whitix/branches/netchannel/user/xynth/src/server/video/vga/kbd.c

    r245 r2061  
    2626 
    2727        /* Document. */ 
    28         SysIoCtl(keyboardFd, 1, 7); 
    2928 
    3029        return keyboardFd; 
  • Whitix/branches/netchannel/user/xynth/src/themes/silverado/Makefile.depend

    r910 r2061  
    1111  ../../../../posix/include/ucontext.h \ 
    1212  ../../../../posix/include/sys/ucontext.h \ 
    13   ../../../../posix/include/getopt.h ../../../../libc/include/ctype.h \ 
     13  ../../../../posix/include/getopt.h ../../../../libc/include/stdint.h \ 
     14  ../../../../libc/include/inttypes.h ../../../../libc/include/ctype.h \ 
    1415  ../../lib/xynth.h ../../../../posix/include/sys/poll.h \ 
    1516  ../../../../posix/include/sys/socket.h \ 
  • Whitix/branches/netchannel/user/xynth/src/widget/Makefile.depend

    r910 r2061  
    88  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    99  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    10   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     10  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     11  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    1112  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    1213  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    2223  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    2324  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    24   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     25  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     26  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    2527  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    2628  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    3638  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    3739  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    38   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     40  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     41  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    3942  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    4043  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    5053  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    5154  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    52   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     55  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     56  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    5357  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    5458  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    6367  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    6468  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
    65   ../lib/xynth_.h ../../../libc/include/errno.h \ 
    66   ../../../libc/include/stdlib.h ../../../libc/include/limits.h \ 
     69  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
     70  ../../../libc/include/limits.h ../lib/xynth_.h \ 
     71  ../../../libc/include/errno.h ../../../libc/include/stdlib.h \ 
    6772  ../../../libc/include/ctype.h ../lib/xynth.h \ 
    6873  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    7883  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    7984  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    80   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     85  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     86  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    8187  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    8288  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    9399  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    94100  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     101  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    95102  ../../../libc/include/ctype.h ../lib/xynth.h \ 
    96103  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    106113  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    107114  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    108   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     115  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     116  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    109117  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    110118  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    121129  ../../../posix/include/signal.h ../../../posix/include/ucontext.h \ 
    122130  ../../../posix/include/sys/ucontext.h ../../../posix/include/getopt.h \ 
     131  ../../../libc/include/stdint.h ../../../libc/include/inttypes.h \ 
    123132  ../../../libc/include/ctype.h ../lib/xynth.h \ 
    124133  ../../../posix/include/sys/poll.h ../../../posix/include/sys/socket.h \ 
     
    134143  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    135144  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    136   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     145  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     146  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    137147  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    138148  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    148158  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    149159  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    150   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     160  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     161  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    151162  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    152163  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    162173  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    163174  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    164   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     175  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     176  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    165177  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    166178  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
     
    176188  ../../../posix/include/sys/wait.h ../../../posix/include/signal.h \ 
    177189  ../../../posix/include/ucontext.h ../../../posix/include/sys/ucontext.h \ 
    178   ../../../posix/include/getopt.h ../../../libc/include/ctype.h \ 
     190  ../../../posix/include/getopt.h ../../../libc/include/stdint.h \ 
     191  ../../../libc/include/inttypes.h ../../../libc/include/ctype.h \ 
    179192  ../lib/xynth.h ../../../posix/include/sys/poll.h \ 
    180193  ../../../posix/include/sys/socket.h ../../../posix/include/sys/un.h \ 
  • Whitix/branches/netchannel/user/xynth/src/widget/widgetc/Makefile.depend

    r910 r2061  
    1111  ../../../../posix/include/ucontext.h \ 
    1212  ../../../../posix/include/sys/ucontext.h \ 
    13   ../../../../posix/include/getopt.h list.h xml.h code.h header.h 
     13  ../../../../posix/include/getopt.h ../../../../libc/include/stdint.h \ 
     14  ../../../../libc/include/inttypes.h list.h xml.h code.h header.h 
    1415list.o: list.c ../../lib/xynth.h ../../lib/list.c \ 
    1516  ../../../../libc/include/stdlib.h ../../../../libc/include/limits.h \ 
     
    3637  ../../../../posix/include/ucontext.h \ 
    3738  ../../../../posix/include/sys/ucontext.h \ 
    38   ../../../../posix/include/getopt.h ../../lib/expat/expat.h \ 
     39  ../../../../posix/include/getopt.h ../../../../libc/include/stdint.h \ 
     40  ../../../../libc/include/inttypes.h ../../lib/expat/expat.h \ 
    3941  ../../lib/expat/expat_external.h 
  • Whitix/branches/netchannel/user/xynth/src/widget/widgetr/Makefile.depend

    r910 r2061  
    1111  ../../../../posix/include/ucontext.h \ 
    1212  ../../../../posix/include/sys/ucontext.h \ 
    13   ../../../../posix/include/getopt.h ../../../../libc/include/ctype.h \ 
     13  ../../../../posix/include/getopt.h ../../../../libc/include/stdint.h \ 
     14  ../../../../libc/include/inttypes.h ../../../../libc/include/ctype.h \ 
    1415  ../../lib/xynth.h ../../../../posix/include/sys/poll.h \ 
    1516  ../../../../posix/include/sys/socket.h \ 
     
    2930  ../../../../posix/include/ucontext.h \ 
    3031  ../../../../posix/include/sys/ucontext.h \ 
    31   ../../../../posix/include/getopt.h ../../../../libc/include/ctype.h \ 
     32  ../../../../posix/include/getopt.h ../../../../libc/include/stdint.h \ 
     33  ../../../../libc/include/inttypes.h ../../../../libc/include/ctype.h \ 
    3234  ../../lib/xynth.h ../../../../posix/include/sys/poll.h \ 
    3335  ../../../../posix/include/sys/socket.h \