Changeset 467bf40 in mainline
- Timestamp:
- 2010-12-25T15:13:07Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a465a56, e84d65a
- Parents:
- ab49a0d (diff), 6eb794a (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. - Files:
-
- 2 added
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
.bzrignore
rab49a0d r467bf40 52 52 ./uspace/app/ping/ping 53 53 ./uspace/app/redir/redir 54 ./uspace/app/sysinfo/sysinfo 54 55 ./uspace/app/sbi/sbi 55 56 ./uspace/app/stats/stats -
boot/Makefile.common
rab49a0d r467bf40 144 144 $(USPACE_PATH)/app/ping/ping \ 145 145 $(USPACE_PATH)/app/stats/stats \ 146 $(USPACE_PATH)/app/sysinfo/sysinfo \ 146 147 $(USPACE_PATH)/app/tasks/tasks \ 147 148 $(USPACE_PATH)/app/top/top \ -
kernel/arch/amd64/src/amd64.c
rab49a0d r467bf40 199 199 void arch_post_smp_init(void) 200 200 { 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 201 207 #ifdef CONFIG_PC_KBD 202 208 /* -
kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
rab49a0d r467bf40 106 106 extern void icp_frame_init(void); 107 107 extern size_t icp_get_irq_count(void); 108 extern const char *icp_get_platform_name(void); 108 109 109 110 extern struct arm_machine_ops icp_machine_ops; -
kernel/arch/arm32/include/mach/testarm/testarm.h
rab49a0d r467bf40 74 74 extern void gxemul_frame_init(void); 75 75 extern size_t gxemul_get_irq_count(void); 76 extern const char *gxemul_get_platform_name(void); 76 77 77 78 extern struct arm_machine_ops gxemul_machine_ops; -
kernel/arch/arm32/include/machine_func.h
rab49a0d r467bf40 56 56 void (*machine_input_init)(void); 57 57 size_t (*machine_get_irq_count)(void); 58 const char *(*machine_get_platform_name)(void); 58 59 }; 59 60 -
kernel/arch/arm32/src/mach/gta02/gta02.c
rab49a0d r467bf40 71 71 static void gta02_input_init(void); 72 72 static size_t gta02_get_irq_count(void); 73 static const char *gta02_get_platform_name(void); 73 74 74 75 static void gta02_timer_irq_init(void); … … 92 93 gta02_output_init, 93 94 gta02_input_init, 94 gta02_get_irq_count 95 gta02_get_irq_count, 96 gta02_get_platform_name 95 97 }; 96 98 … … 235 237 } 236 238 239 const char *gta02_get_platform_name(void) 240 { 241 return "gta02"; 242 } 243 237 244 static void gta02_timer_irq_init(void) 238 245 { -
kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
rab49a0d r467bf40 65 65 icp_output_init, 66 66 icp_input_init, 67 icp_get_irq_count 67 icp_get_irq_count, 68 icp_get_platform_name 68 69 }; 69 70 … … 342 343 } 343 344 345 const char *icp_get_platform_name(void) 346 { 347 return "integratorcp"; 348 } 349 344 350 /** @} 345 351 */ -
kernel/arch/arm32/src/mach/testarm/testarm.c
rab49a0d r467bf40 65 65 gxemul_output_init, 66 66 gxemul_input_init, 67 gxemul_get_irq_count 67 gxemul_get_irq_count, 68 gxemul_get_platform_name 68 69 }; 69 70 … … 132 133 } 133 134 135 const char *gxemul_get_platform_name(void) 136 { 137 return "gxemul"; 138 } 139 134 140 /** Starts gxemul Real Time Clock device, which asserts regular interrupts. 135 141 * -
kernel/arch/ia32/src/ia32.c
rab49a0d r467bf40 157 157 void arch_post_smp_init(void) 158 158 { 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 159 165 #ifdef CONFIG_PC_KBD 160 166 /* -
kernel/arch/ia64/src/ia64.c
rab49a0d r467bf40 147 147 void arch_post_smp_init(void) 148 148 { 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 149 161 #ifdef MACHINE_ski 150 162 ski_instance_t *ski_instance = skiin_init(); -
kernel/arch/mips32/src/mips32.c
rab49a0d r467bf40 168 168 void arch_post_smp_init(void) 169 169 { 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 170 185 #ifdef CONFIG_MIPS_KBD 171 186 /* -
kernel/arch/ppc32/src/ppc32.c
rab49a0d r467bf40 249 249 void arch_post_smp_init(void) 250 250 { 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 251 257 ofw_tree_walk_by_device_type("mac-io", macio_register, NULL); 252 258 } -
kernel/arch/sparc64/src/sun4u/sparc64.c
rab49a0d r467bf40 50 50 #include <ddi/irq.h> 51 51 #include <str.h> 52 #include <sysinfo/sysinfo.h> 52 53 53 54 memmap_t memmap; … … 111 112 void arch_post_smp_init(void) 112 113 { 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 113 120 standalone_sparc64_console_init(); 114 121 } -
kernel/arch/sparc64/src/sun4v/sparc64.c
rab49a0d r467bf40 52 52 #include <str.h> 53 53 #include <arch/drivers/niagara.h> 54 #include <sysinfo/sysinfo.h> 54 55 55 56 memmap_t memmap; … … 109 110 void arch_post_smp_init(void) 110 111 { 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 111 118 niagarain_init(); 112 119 } -
uspace/Makefile
rab49a0d r467bf40 55 55 app/nettest2 \ 56 56 app/ping \ 57 app/sysinfo \ 57 58 srv/clip \ 58 59 srv/devmap \ -
uspace/drv/root/root.c
rab49a0d r467bf40 47 47 #include <macros.h> 48 48 #include <inttypes.h> 49 #include <sysinfo.h> 49 50 50 51 #include <driver.h> … … 55 56 56 57 #define PLATFORM_DEVICE_NAME "hw" 57 #define PLATFORM_DEVICE_MATCH_ID STRING(UARCH)58 #define PLATFORM_DEVICE_MATCH_ID_FMT "platform/%s" 58 59 #define PLATFORM_DEVICE_MATCH_SCORE 100 59 60 … … 100 101 static int add_platform_child(device_t *parent) 101 102 { 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 102 134 printf(NAME ": adding new child for platform device.\n"); 103 135 printf(NAME ": device node is `%s' (%d %s)\n", PLATFORM_DEVICE_NAME, 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); 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); 109 140 110 141 return res; -
uspace/drv/rootpc/rootpc.c
rab49a0d r467bf40 28 28 29 29 /** 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.30 * @defgroup root_pc PC platform driver. 31 * @brief HelenOS PC platform driver. 32 32 * @{ 33 33 */ … … 182 182 /* Register child devices. */ 183 183 if (!rootpc_add_children(dev)) { 184 printf(NAME ": failed to add child devices for platform " 185 "ia32.\n"); 184 printf(NAME ": failed to add child devices for PC platform.\n"); 186 185 } 187 186 … … 196 195 int main(int argc, char *argv[]) 197 196 { 198 printf(NAME ": HelenOS rootpc devicedriver\n");197 printf(NAME ": HelenOS PC platform driver\n"); 199 198 root_pc_init(); 200 199 return driver_main(&rootpc_driver); -
uspace/drv/rootpc/rootpc.ma
rab49a0d r467bf40 1 10 ia32 2 10 amd64 1 10 platform/pc
Note:
See TracChangeset
for help on using the changeset viewer.