Changeset c6a7b3a in mainline for uspace


Ignore:
Timestamp:
2013-03-28T20:39:16Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2d1fdcad
Parents:
cc3c27ad (diff), 5d9fce4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

mainline changes

Location:
uspace
Files:
4 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    rcc3c27ad rc6a7b3a  
    9797        srv/bd/sata_bd \
    9898        srv/bd/file_bd \
    99         srv/bd/gxe_bd \
    10099        srv/bd/rd \
    101100        srv/bd/part/guid_part \

  • uspace/app/init/init.c

    rcc3c27ad rc6a7b3a  
    369369#ifdef CONFIG_START_BD
    370370        srv_start("/srv/ata_bd");
    371         srv_start("/srv/gxe_bd");
    372371#endif
    373372       

  • uspace/lib/c/arch/mips32/Makefile.common

    rcc3c27ad rc6a7b3a  
    2727#
    2828
    29 GCC_CFLAGS += -msoft-float -mips3 -mabi=32
     29GCC_CFLAGS += -msoft-float -mabi=32
    3030BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    3131
    … …  
    3434BFD_ARCH = mips
    3535BFD_NAME = elf32-tradlittlemips
     36
     37ifeq ($(MACHINE),msim)
     38        GCC_CFLAGS += -march=r4000
     39endif
     40
     41ifeq ($(MACHINE),lmalta)
     42        GCC_CFLAGS += -march=4kc
     43endif
     44

  • uspace/lib/c/arch/mips32eb/Makefile.common

    rcc3c27ad rc6a7b3a  
    2727#
    2828
    29 GCC_CFLAGS += -msoft-float -mips3 -mabi=32
     29GCC_CFLAGS += -msoft-float -mabi=32
    3030BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
    3131
    … …  
    3434BFD_ARCH = mips
    3535BFD_NAME = elf32-tradbigmips
     36
     37ifeq ($(MACHINE),bmalta)
     38        GCC_CFLAGS += -march=4kc
     39endif
     40

  • uspace/srv/fs/exfat/exfat_fat.c

    rcc3c27ad rc6a7b3a  
    401401{
    402402        service_id_t service_id = nodep->idx->service_id;
    403         exfat_cluster_t lastc;
     403        exfat_cluster_t lastc = 0;
    404404        int rc;
    405405

  • uspace/srv/fs/fat/fat_fat.c

    rcc3c27ad rc6a7b3a  
    128128{
    129129        fat_cluster_t firstc = nodep->firstc;
    130         fat_cluster_t currc;
     130        fat_cluster_t currc = 0;
    131131        aoff64_t relbn = bn;
    132132        int rc;
    … …  
    194194        uint32_t clusters;
    195195        uint32_t max_clusters;
    196         fat_cluster_t c;
     196        fat_cluster_t c = 0;
    197197        int rc;
    198198
    … …  
    679679        fat_cluster_t *lifo;    /* stack for storing free cluster numbers */
    680680        unsigned found = 0;     /* top of the free cluster number stack */
    681         fat_cluster_t clst, value, clst_last1 = FAT_CLST_LAST1(bs);
     681        fat_cluster_t clst;
     682        fat_cluster_t value = 0;
     683        fat_cluster_t clst_last1 = FAT_CLST_LAST1(bs);
    682684        int rc = EOK;
    683685
    … …  
    783785{
    784786        service_id_t service_id = nodep->idx->service_id;
    785         fat_cluster_t lastc;
     787        fat_cluster_t lastc = 0;
    786788        uint8_t fatno;
    787789        int rc;
    … …  
    907909int fat_sanity_check(fat_bs_t *bs, service_id_t service_id)
    908910{
    909         fat_cluster_t e0, e1;
     911        fat_cluster_t e0 = 0;
     912        fat_cluster_t e1 = 0;
    910913        unsigned fat_no;
    911914        int rc;

  • uspace/srv/fs/mfs/mfs_ops.c

    rcc3c27ad rc6a7b3a  
    773773{
    774774        int rc;
    775         fs_node_t *fn;
     775        fs_node_t *fn = NULL;
    776776
    777777        rc = mfs_node_get(&fn, service_id, index);
    … …  
    11081108mfs_sync(service_id_t service_id, fs_index_t index)
    11091109{
    1110         fs_node_t *fn;
     1110        fs_node_t *fn = NULL;
    11111111        int rc = mfs_node_get(&fn, service_id, index);
    11121112        if (rc != EOK)

  • uspace/srv/hid/input/Makefile

    rcc3c27ad rc6a7b3a  
    3939        port/adb_mouse.c \
    4040        port/chardev.c \
    41         port/gxemul.c \
    4241        port/msim.c \
    4342        port/niagara.c \
    … …  
    4847        proto/mousedev.c \
    4948        ctl/apple.c \
    50         ctl/gxe_fb.c \
    5149        ctl/kbdev.c \
    5250        ctl/pc.c \

  • uspace/srv/hid/input/input.c

    rcc3c27ad rc6a7b3a  
    440440        kbd_add_dev(&msim_port, &stty_ctl);
    441441#endif
    442 #if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
    443         kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
    444 #endif
    445 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
    446         kbd_add_dev(&gxemul_port, &stty_ctl);
    447 #endif
    448442#if defined(UARCH_ppc32)
    449443        kbd_add_dev(&adb_port, &apple_ctl);

  • uspace/srv/hid/input/kbd_ctl.h

    rcc3c27ad rc6a7b3a  
    4949
    5050extern kbd_ctl_ops_t apple_ctl;
    51 extern kbd_ctl_ops_t gxe_fb_ctl;
    5251extern kbd_ctl_ops_t kbdev_ctl;
    5352extern kbd_ctl_ops_t pc_ctl;

  • uspace/srv/hid/input/kbd_port.h

    rcc3c27ad rc6a7b3a  
    5151extern kbd_port_ops_t adb_port;
    5252extern kbd_port_ops_t chardev_port;
    53 extern kbd_port_ops_t gxemul_port;
    5453extern kbd_port_ops_t msim_port;
    5554extern kbd_port_ops_t niagara_port;
Note: See TracChangeset for help on using the changeset viewer.