Changes in / [467bf40:ab49a0d] in mainline


Ignore:
Files:
2 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    r467bf40 rab49a0d  
    5252./uspace/app/ping/ping
    5353./uspace/app/redir/redir
    54 ./uspace/app/sysinfo/sysinfo
    5554./uspace/app/sbi/sbi
    5655./uspace/app/stats/stats

  • boot/Makefile.common

    r467bf40 rab49a0d  
    144144        $(USPACE_PATH)/app/ping/ping \
    145145        $(USPACE_PATH)/app/stats/stats \
    146         $(USPACE_PATH)/app/sysinfo/sysinfo \
    147146        $(USPACE_PATH)/app/tasks/tasks \
    148147        $(USPACE_PATH)/app/top/top \

  • kernel/arch/amd64/src/amd64.c

    r467bf40 rab49a0d  
    199199void arch_post_smp_init(void)
    200200{
    201         /* Currently the only supported platform for amd64 is 'pc'. */
    202         static const char *platform = "pc";
    203 
    204         sysinfo_set_item_data("platform", NULL, (void *) platform,
    205             str_size(platform));
    206 
    207201#ifdef CONFIG_PC_KBD
    208202        /*

  • kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

    r467bf40 rab49a0d  
    106106extern void icp_frame_init(void);
    107107extern size_t icp_get_irq_count(void);
    108 extern const char *icp_get_platform_name(void);
    109108
    110109extern struct arm_machine_ops icp_machine_ops;

  • kernel/arch/arm32/include/mach/testarm/testarm.h

    r467bf40 rab49a0d  
    7474extern void gxemul_frame_init(void);
    7575extern size_t gxemul_get_irq_count(void);
    76 extern const char *gxemul_get_platform_name(void);
    7776
    7877extern struct arm_machine_ops gxemul_machine_ops;

  • kernel/arch/arm32/include/machine_func.h

    r467bf40 rab49a0d  
    5656        void (*machine_input_init)(void);
    5757        size_t (*machine_get_irq_count)(void);
    58         const char *(*machine_get_platform_name)(void);
    5958};
    6059

  • kernel/arch/arm32/src/mach/gta02/gta02.c

    r467bf40 rab49a0d  
    7171static void gta02_input_init(void);
    7272static size_t gta02_get_irq_count(void);
    73 static const char *gta02_get_platform_name(void);
    7473
    7574static void gta02_timer_irq_init(void);
    … …  
    9392        gta02_output_init,
    9493        gta02_input_init,
    95         gta02_get_irq_count,
    96         gta02_get_platform_name
     94        gta02_get_irq_count
    9795};
    9896
    … …  
    237235}
    238236
    239 const char *gta02_get_platform_name(void)
    240 {
    241         return "gta02";
    242 }
    243 
    244237static void gta02_timer_irq_init(void)
    245238{

  • kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

    r467bf40 rab49a0d  
    6565        icp_output_init,
    6666        icp_input_init,
    67         icp_get_irq_count,
    68         icp_get_platform_name
     67        icp_get_irq_count
    6968};
    7069
    … …  
    343342}
    344343
    345 const char *icp_get_platform_name(void)
    346 {
    347         return "integratorcp";
    348 }
    349 
    350344/** @}
    351345 */

  • kernel/arch/arm32/src/mach/testarm/testarm.c

    r467bf40 rab49a0d  
    6565        gxemul_output_init,
    6666        gxemul_input_init,
    67         gxemul_get_irq_count,
    68         gxemul_get_platform_name
     67        gxemul_get_irq_count
    6968};
    7069
    … …  
    133132}
    134133
    135 const char *gxemul_get_platform_name(void)
    136 {
    137         return "gxemul";
    138 }
    139 
    140134/** Starts gxemul Real Time Clock device, which asserts regular interrupts.
    141135 *

  • kernel/arch/ia32/src/ia32.c

    r467bf40 rab49a0d  
    157157void arch_post_smp_init(void)
    158158{
    159         /* Currently the only supported platform for ia32 is 'pc'. */
    160         static const char *platform = "pc";
    161 
    162         sysinfo_set_item_data("platform", NULL, (void *) platform,
    163             str_size(platform));
    164 
    165159#ifdef CONFIG_PC_KBD
    166160        /*

  • kernel/arch/ia64/src/ia64.c

    r467bf40 rab49a0d  
    147147void arch_post_smp_init(void)
    148148{
    149         static const char *platform;
    150 
    151         /* Set platform name. */
    152 #ifdef MACHINE_ski
    153         platform = "pc";
    154 #endif
    155 #ifdef MACHINE_i460GX
    156         platform = "i460GX";
    157 #endif
    158         sysinfo_set_item_data("platform", NULL, (void *) platform,
    159             str_size(platform));
    160 
    161149#ifdef MACHINE_ski
    162150        ski_instance_t *ski_instance = skiin_init();

  • kernel/arch/mips32/src/mips32.c

    r467bf40 rab49a0d  
    168168void arch_post_smp_init(void)
    169169{
    170         static const char *platform;
    171 
    172         /* Set platform name. */
    173 #ifdef MACHINE_msim
    174         platform = "msim";
    175 #endif
    176 #ifdef MACHINE_bgxemul
    177         platform = "gxemul";
    178 #endif
    179 #ifdef MACHINE_lgxemul
    180         platform = "gxemul";
    181 #endif
    182         sysinfo_set_item_data("platform", NULL, (void *) platform,
    183             str_size(platform));
    184 
    185170#ifdef CONFIG_MIPS_KBD
    186171        /*

  • kernel/arch/ppc32/src/ppc32.c

    r467bf40 rab49a0d  
    249249void arch_post_smp_init(void)
    250250{
    251         /* Currently the only supported platform for ppc32 is 'mac'. */
    252         static const char *platform = "mac";
    253 
    254         sysinfo_set_item_data("platform", NULL, (void *) platform,
    255             str_size(platform));
    256 
    257251        ofw_tree_walk_by_device_type("mac-io", macio_register, NULL);
    258252}

  • kernel/arch/sparc64/src/sun4u/sparc64.c

    r467bf40 rab49a0d  
    5050#include <ddi/irq.h>
    5151#include <str.h>
    52 #include <sysinfo/sysinfo.h>
    5352
    5453memmap_t memmap;
    … …  
    112111void arch_post_smp_init(void)
    113112{
    114         /* Currently the only supported platform for sparc64/sun4u is 'sun4u'. */
    115         static const char *platform = "sun4u";
    116 
    117         sysinfo_set_item_data("platform", NULL, (void *) platform,
    118             str_size(platform));
    119 
    120113        standalone_sparc64_console_init();
    121114}

  • kernel/arch/sparc64/src/sun4v/sparc64.c

    r467bf40 rab49a0d  
    5252#include <str.h>
    5353#include <arch/drivers/niagara.h>
    54 #include <sysinfo/sysinfo.h>
    5554
    5655memmap_t memmap;
    … …  
    110109void arch_post_smp_init(void)
    111110{
    112         /* Currently the only supported platform for sparc64/sun4v is 'sun4v'. */
    113         static const char *platform = "sun4v";
    114 
    115         sysinfo_set_item_data("platform", NULL, (void *) platform,
    116             str_size(platform));
    117 
    118111        niagarain_init();
    119112}

  • uspace/Makefile

    r467bf40 rab49a0d  
    5555        app/nettest2 \
    5656        app/ping \
    57         app/sysinfo \
    5857        srv/clip \
    5958        srv/devmap \

  • uspace/drv/root/root.c

    r467bf40 rab49a0d  
    4747#include <macros.h>
    4848#include <inttypes.h>
    49 #include <sysinfo.h>
    5049
    5150#include <driver.h>
    … …  
    5655
    5756#define PLATFORM_DEVICE_NAME "hw"
    58 #define PLATFORM_DEVICE_MATCH_ID_FMT "platform/%s"
     57#define PLATFORM_DEVICE_MATCH_ID STRING(UARCH)
    5958#define PLATFORM_DEVICE_MATCH_SCORE 100
    6059
    … …  
    101100static int add_platform_child(device_t *parent)
    102101{
    103         char *match_id;
    104         char *platform;
    105         size_t platform_size;
    106         int res;
    107 
    108         /* Get platform name from sysinfo. */
    109 
    110         platform = sysinfo_get_data("platform", &platform_size);
    111         if (platform == NULL) {
    112                 printf(NAME ": Failed to obtain platform name.\n");
    113                 return ENOENT;
    114         }
    115 
    116         /* Null-terminate string. */
    117         platform = realloc(platform, platform_size + 1);
    118         if (platform == NULL) {
    119                 printf(NAME ": Memory allocation failed.\n");
    120                 return ENOMEM;
    121         }
    122 
    123         platform[platform_size] = '\0';
    124 
    125         /* Construct match ID. */
    126 
    127         if (asprintf(&match_id, PLATFORM_DEVICE_MATCH_ID_FMT, platform) == -1) {
    128                 printf(NAME ": Memory allocation failed.\n");
    129                 return ENOMEM;
    130         }
    131 
    132         /* Add child. */
    133 
    134102        printf(NAME ": adding new child for platform device.\n");
    135103        printf(NAME ":   device node is `%s' (%d %s)\n", PLATFORM_DEVICE_NAME,
    136             PLATFORM_DEVICE_MATCH_SCORE, match_id);
    137 
    138         res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
    139             match_id, PLATFORM_DEVICE_MATCH_SCORE, NULL);
     104            PLATFORM_DEVICE_MATCH_SCORE, PLATFORM_DEVICE_MATCH_ID);
     105       
     106        int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
     107            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE,
     108            NULL);
    140109
    141110        return res;

  • uspace/drv/rootpc/rootpc.c

    r467bf40 rab49a0d  
    2828
    2929/**
    30  * @defgroup root_pc PC platform driver.
    31  * @brief HelenOS PC platform driver.
     30 * @defgroup root_pc Root HW device driver for ia32 and amd64 platform.
     31 * @brief HelenOS root HW device driver for ia32 and amd64 platform.
    3232 * @{
    3333 */
    … …  
    182182        /* Register child devices. */
    183183        if (!rootpc_add_children(dev)) {
    184                 printf(NAME ": failed to add child devices for PC platform.\n");
     184                printf(NAME ": failed to add child devices for platform "
     185                    "ia32.\n");
    185186        }
    186187       
    … …  
    195196int main(int argc, char *argv[])
    196197{
    197         printf(NAME ": HelenOS PC platform driver\n");
     198        printf(NAME ": HelenOS rootpc device driver\n");
    198199        root_pc_init();
    199200        return driver_main(&rootpc_driver);

  • uspace/drv/rootpc/rootpc.ma

    r467bf40 rab49a0d  
    1 10 platform/pc
     110 ia32
     210 amd64
Note: See TracChangeset for help on using the changeset viewer.