Changeset 232cd4f in mainline
- Timestamp:
- 2012-12-05T21:39:28Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 295732b
- Parents:
- c0a7545
- Files:
-
- 6 deleted
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
rc0a7545 r232cd4f 44 44 % Machine type 45 45 @ "msim" MSIM 46 @ "bgxemul" GXEmul big endian47 @ "lgxemul" GXEmul little endian48 46 @ "bmalta" MIPS Malta Development Board big endian 49 47 @ "lmalta" MIPS Malta Development Board little endian … … 186 184 % User space architecture 187 185 @ "mips32" 188 ! [PLATFORM=mips32&(MACHINE=msim|MACHINE=l gxemul|MACHINE=lmalta)] UARCH (choice)186 ! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lmalta)] UARCH (choice) 189 187 190 188 % User space architecture 191 189 @ "mips32eb" 192 ! [PLATFORM=mips32& (MACHINE=bgxemul|MACHINE=bmalta)] UARCH (choice)190 ! [PLATFORM=mips32&MACHINE=bmalta] UARCH (choice) 193 191 194 192 % User space architecture … … 265 263 @ "elf" 266 264 ! [PLATFORM=mips32&(MACHINE=bmalta|MACHINE=lmalta)] IMAGE (choice) 267 268 % Image format269 @ "ecoff"270 ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)271 265 272 266 % Image format … … 357 351 ! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y) 358 352 359 % FPU support360 ! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)361 362 353 ## armv7 made fpu hardware compulsory 363 354 % FPU support … … 446 437 ! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&(MACHINE=msim|MACHINE=bmalta|MACHINE=lmalta))|(PLATFORM=mips64&MACHINE=msim)] CONFIG_HID_OUT (choice) 447 438 448 % Output device class449 @ "generic" Monitor or serial line450 @ "monitor" Monitor451 @ "serial" Serial line452 @ "none" No output device453 ! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)454 455 439 % PC keyboard support 456 440 ! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n) … … 462 446 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=arm32&MACHINE=integratorcp] CONFIG_PC_KBD (y/n) 463 447 464 % Support for msim /GXemulkeyboard448 % Support for msim keyboard 465 449 ! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n) 466 450 467 % Support for msim /GXemulprinter451 % Support for msim printer 468 452 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n) 469 453 … … 518 502 % Framebuffer support 519 503 ! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32)] CONFIG_FB (y/n) 520 521 % Framebuffer support522 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n)523 504 524 505 % Framebuffer support -
boot/arch/mips32/Makefile.inc
rc0a7545 r232cd4f 31 31 EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32 32 32 33 RD_SRVS_NON_ESSENTIAL += \34 $(USPACE_PATH)/srv/bd/gxe_bd/gxe_bd35 36 ifeq ($(MACHINE),lgxemul)37 BFD_NAME = elf32-tradlittlemips38 BFD_OUTPUT = ecoff-littlemips39 ENDIANESS = LE40 endif41 ifeq ($(MACHINE),bgxemul)42 BFD_NAME = elf32-tradbigmips43 BFD_OUTPUT = ecoff-bigmips44 ENDIANESS = BE45 endif46 33 ifeq ($(MACHINE),msim) 47 34 BFD_NAME = elf32-tradlittlemips -
kernel/arch/mips32/Makefile.inc
rc0a7545 r232cd4f 36 36 # 37 37 38 ifeq ($(MACHINE),lgxemul)39 BFD_NAME = elf32-tradlittlemips40 ENDIANESS = LE41 endif42 ifeq ($(MACHINE),bgxemul)43 BFD_NAME = elf32-tradbigmips44 ENDIANESS = BE45 GCC_CFLAGS += -D__BE__46 endif47 38 ifeq ($(MACHINE),msim) 48 39 BFD_NAME = elf32-tradlittlemips -
kernel/arch/mips32/src/mips32.c
rc0a7545 r232cd4f 125 125 interrupt_init(); 126 126 127 #ifdef CONFIG_FB128 /* GXemul framebuffer */129 fb_properties_t gxemul_prop = {130 .addr = 0x12000000,131 .offset = 0,132 .x = 640,133 .y = 480,134 .scan = 1920,135 .visual = VISUAL_RGB_8_8_8,136 };137 138 outdev_t *fbdev = fb_init(&gxemul_prop);139 if (fbdev)140 stdout_wire(fbdev);141 #endif142 143 127 #ifdef CONFIG_MIPS_PRN 144 128 outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS); … … 164 148 platform = "msim"; 165 149 #endif 166 #ifdef MACHINE_bgxemul167 platform = "gxemul";168 #endif169 #ifdef MACHINE_lgxemul170 platform = "gxemul";171 #endif172 150 sysinfo_set_item_data("platform", NULL, (void *) platform, 173 151 str_size(platform)); … … 175 153 #ifdef CONFIG_MIPS_KBD 176 154 /* 177 * Initialize the msim/GXemul keyboard port. Then initialize the serial line 178 * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts. 155 * Initialize the msim keyboard port. Then initialize the serial line 156 * module and connect it to the msim keyboard. Enable keyboard 157 * interrupts. 179 158 */ 180 159 dsrlnin_instance_t *dsrlnin_instance -
kernel/arch/mips32/src/mm/frame.c
rc0a7545 r232cd4f 82 82 /* MSIM device (dkeyboard) */ 83 83 if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH)) 84 return false;85 #endif86 87 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)88 /* gxemul devices */89 if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,90 0x10000000, MiB2SIZE(256)))91 84 return false; 92 85 #endif … … 225 218 if (ZERO_PAGE_VALUE != 0xdeadbeef) 226 219 avail = false; 227 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)228 else {229 ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;230 if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)231 avail = false;232 }233 #endif234 220 } 235 221 } -
kernel/arch/mips64/src/mips64.c
rc0a7545 r232cd4f 153 153 #ifdef CONFIG_MIPS_KBD 154 154 /* 155 * Initialize the msim/GXemul keyboard port. Then initialize the serial line 156 * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts. 155 * Initialize the msim keyboard port. Then initialize the serial line 156 * module and connect it to the msim keyboard. Enable keyboard 157 * interrupts. 157 158 */ 158 159 dsrlnin_instance_t *dsrlnin_instance -
release/Makefile
rc0a7545 r232cd4f 33 33 34 34 PROFILES = amd64 arm32/integratorcp arm32/gta02 arm32/beagleboardxm ia32 \ 35 ia64/i460GX ia64/ski mips32/GXemul mips32/msim ppc32 \ 36 sparc64/ultra 35 ia64/i460GX ia64/ski mips32/msim ppc32 sparc64/ultra 37 36 38 37 BZR = bzr -
tools/autotool.py
rc0a7545 r232cd4f 676 676 common['CC_ARGS'].append("-mabi=32") 677 677 678 if ((config['MACHINE'] == " lgxemul") or (config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")):678 if ((config['MACHINE'] == "msim") or (config['MACHINE'] == "lmalta")): 679 679 target = config['PLATFORM'] 680 680 gnu_target = "mipsel-linux-gnu" 681 681 682 if ((config['MACHINE'] == "b gxemul") or (config['MACHINE'] == "bmalta")):682 if ((config['MACHINE'] == "bmalta")): 683 683 target = "mips32eb" 684 684 gnu_target = "mips-linux-gnu" -
uspace/Makefile
rc0a7545 r232cd4f 93 93 srv/bd/sata_bd \ 94 94 srv/bd/file_bd \ 95 srv/bd/gxe_bd \96 95 srv/bd/rd \ 97 96 srv/bd/part/guid_part \ -
uspace/app/init/init.c
rc0a7545 r232cd4f 369 369 #ifdef CONFIG_START_BD 370 370 srv_start("/srv/ata_bd"); 371 srv_start("/srv/gxe_bd");372 371 #endif 373 372 -
uspace/srv/hid/input/Makefile
rc0a7545 r232cd4f 38 38 port/adb_mouse.c \ 39 39 port/chardev.c \ 40 port/gxemul.c \41 40 port/msim.c \ 42 41 port/niagara.c \ … … 47 46 proto/mousedev.c \ 48 47 ctl/apple.c \ 49 ctl/gxe_fb.c \50 48 ctl/kbdev.c \ 51 49 ctl/pc.c \ -
uspace/srv/hid/input/input.c
rc0a7545 r232cd4f 432 432 kbd_add_dev(&msim_port, &stty_ctl); 433 433 #endif 434 #if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)435 kbd_add_dev(&gxemul_port, &gxe_fb_ctl);436 #endif437 #if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)438 kbd_add_dev(&gxemul_port, &stty_ctl);439 #endif440 434 #if defined(UARCH_ppc32) 441 435 kbd_add_dev(&adb_port, &apple_ctl); -
uspace/srv/hid/input/kbd_ctl.h
rc0a7545 r232cd4f 49 49 50 50 extern kbd_ctl_ops_t apple_ctl; 51 extern kbd_ctl_ops_t gxe_fb_ctl;52 51 extern kbd_ctl_ops_t kbdev_ctl; 53 52 extern kbd_ctl_ops_t pc_ctl; -
uspace/srv/hid/input/kbd_port.h
rc0a7545 r232cd4f 51 51 extern kbd_port_ops_t adb_port; 52 52 extern kbd_port_ops_t chardev_port; 53 extern kbd_port_ops_t gxemul_port;54 53 extern kbd_port_ops_t msim_port; 55 54 extern kbd_port_ops_t niagara_port;
Note:
See TracChangeset
for help on using the changeset viewer.