summaryrefslogtreecommitdiff
path: root/frontends/kolibrios
diff options
context:
space:
mode:
authorAshish Gupta <ashmew2@gmail.com>2017-05-11 17:14:01 +0200
committerAshish Gupta <ashmew2@gmail.com>2017-06-10 08:25:29 +0200
commit839c2e8e6342dae087b73812ffeffda47af2094a (patch)
treee5ff3a7bc8b2e4bf6364cfb4508b3e383b1213c5 /frontends/kolibrios
parent5aeb8eb5583d7d088c8132d3dca0dc3c34d8c565 (diff)
downloadnetsurf-839c2e8e6342dae087b73812ffeffda47af2094a.tar.gz
netsurf-839c2e8e6342dae087b73812ffeffda47af2094a.tar.bz2
Tidy up some things.
Diffstat (limited to 'frontends/kolibrios')
-rw-r--r--frontends/kolibrios/fb/gui.c8
-rw-r--r--frontends/kolibrios/loadhttp.asm19
2 files changed, 15 insertions, 12 deletions
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index d12bdfcf0..ebd3a3d3b 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -30,6 +30,8 @@
#include <libnsfb_plot.h>
#include <libnsfb_event.h>
+#include <kos32sys.h>
+
#include "utils/utils.h"
#include "utils/nsoption.h"
#include "utils/filepath.h"
@@ -491,7 +493,7 @@ process_cmdline(int argc, char** argv)
}
/* Remove me! */
- feurl = "http://www.kolibrios.org";
+ feurl = "http://board.kolibrios.org";
/* NS on KolibriOS does not support option parsing (yet) */
@@ -2124,6 +2126,10 @@ int main(int argc, char** argv)
.layout = framebuffer_layout_table,
};
+ /* Initialize heap so that we can do memory allocations */
+ unsigned int heapsize = heap_init();
+ debug_board_printf("[SYSTEM] Initialized heap (Size = %u bytes)\n", heapsize);
+ assert(heapsize != 0);
/* fix args */
#define MKARGV(i,opt) argv[i] = (char *) malloc(strlen(opt) + 1); strcpy(argv[i], opt);
diff --git a/frontends/kolibrios/loadhttp.asm b/frontends/kolibrios/loadhttp.asm
index 859f56db1..3aa7b27a1 100644
--- a/frontends/kolibrios/loadhttp.asm
+++ b/frontends/kolibrios/loadhttp.asm
@@ -21,27 +21,24 @@ public init_network as '_init_network_asm'
;;; Returns 0 on success. -1 on failure.
proc init_network
-
- mcall 68,11
-
stdcall dll.Load, @IMPORT
- test eax, eax
- jnz error
+ test eax, eax
+ jnz error
mov eax, 0
ret
-
-error:
+
+error:
mov eax, -1
ret
-endp
-
+endp
+
@IMPORT:
library lib_http, 'http.obj'
import lib_http, \
- HTTP_get , 'get' , \
+ HTTP_get , 'get' , \
HTTP_head , 'head' , \
HTTP_post , 'post' , \
HTTP_find_header_field , 'find_header_field' , \
@@ -51,7 +48,7 @@ import lib_http, \
HTTP_free , 'free' , \
HTTP_escape , 'escape' , \
HTTP_unescape , 'unescape'
-
+
public HTTP_get as '_http_get_asm'
public HTTP_head as '_http_head_asm'
public HTTP_post as '_http_post_asm'