From: John Hodge <tpg@mutabah.net>
Date: Sun, 12 May 2013 11:08:28 +0000 (+0800)
Subject: Merge branch 'master' of git://localhost/acess2
X-Git-Tag: rel0.15~498
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=608ec5aa6e1bd522777faa63323beaeaef928928;hp=-c;p=tpg%2Facess2.git

Merge branch 'master' of git://localhost/acess2
---

608ec5aa6e1bd522777faa63323beaeaef928928
diff --combined KernelLand/Modules/Network/E1000/e1000.c
index fc657a1e,68c020da..bc60593e
--- a/KernelLand/Modules/Network/E1000/e1000.c
+++ b/KernelLand/Modules/Network/E1000/e1000.c
@@@ -118,11 -118,8 +118,11 @@@ void E1000_int_ReleaseRXD(void *Arg, si
  {
  	tCard	**cardptr = Arg;
  	tCard	*Card = *cardptr;
 -	 int	rxd = (Arg - (void*)Card->RXDescs) / sizeof(tRXDesc);
 -	
 +	 int	rxd = (Arg - (void*)Card->RXBackHandles) / sizeof(void*);
 +
 +	LOG("RXD %p %i being released", Card, rxd);
 +	ASSERT(rxd >= 0 && rxd < NUM_RX_DESC);
 +
  	Card->RXDescs[rxd].Status = 0;
  	Mutex_Acquire(&Card->lRXDescs);
  	if( rxd == REG32(Card, REG_RDT) ) {
@@@ -386,7 -383,7 +386,7 @@@ int DrvUtil_AllocBuffers(void **Buffers
  		size_t	ofs = 0;
  		const int 	bufs_per_page = PAGE_SIZE / BufSize;
  		ASSERT(bufs_per_page * BufSize == PAGE_SIZE);
- 		void	*page;
+ 		void	*page = NULL;
  		for( int i = 0; i < NumBufs; i ++ )
  		{
  			if( ofs == 0 ) {
diff --combined RunQemu
index 07980b6f,c34d963a..68f6efc8
--- a/RunQemu
+++ b/RunQemu
@@@ -9,11 -9,12 +9,13 @@@ QEMU_PARAMS="
  QEMU_PARAMS=$QEMU_PARAMS" -hda AcessHDD.img"
  QEMU_PARAMS=$QEMU_PARAMS" -vga std"
  QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
 -QEMU_PARAMS=$QEMU_PARAMS" -net nic"
 +QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=e1000"
 +#QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=rtl8139"
  
 -_NETTYPE="user"
 +_NETTYPE="user,hostfwd=tcp::5555-:23"
  
+ _EVAL=eval
+ 
  while [ $# -ne 0 ]; do
  	case $1 in
  	-gdb)
@@@ -48,6 -49,9 +50,9 @@@
  		shift
  		QEMU_PARAMS=$QEMU_PARAMS" "$1
  		;;
+ 	-n)
+ 		_EVAL=echo
+ 		;;
  	-fwd)
  		_NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
  		;;
@@@ -81,13 -85,13 +86,13 @@@ f
  #	qemu-system-x86_64 $QEMU_PARAMS -serial stdio | tee QemuLog.txt
  #echo $QEMU $BOOTOPT $QEMU_PARAMS
  if [ "x$_NOGRAPHIC" = "xyes" ] ; then
- 	eval $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
+ 	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
  	exit
  fi
  
  if [ "x$_NOTEE" = "xyes" ] ; then
- 	eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+ 	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
  	exit
  fi
  
- eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+ $_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
diff --combined Usermode/Applications/axwin3_src/Interface/main.c
index abe21e51,5f323e46..82cedc23
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@@ -22,6 -22,7 +22,7 @@@ void	create_run_dialog(void)
  void	mainmenu_run_dialog(void *unused);
  void	mainmenu_app_terminal(void *unused);
  void	mainmenu_app_textedit(void *unused);
+ void	update_time(void);
  
  // === GLOBALS ===
  tHWND	gSidebar;
@@@ -29,6 -30,7 +30,7 @@@ tAxWin3_Widget	*gSidebarRoot
  tHWND	gSystemMenu;
  tHWND	gRunDialog;
  tAxWin3_Widget	*gRunInput;
+ tAxWin3_Widget	*gTimeDisplay;
   int	giScreenWidth;
   int	giScreenHeight;
  char	**gEnvion;
@@@ -97,9 -99,10 +99,10 @@@ void create_sidebar(void
  		ELEFLAG_VERTICAL|ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH,
  		"Version/Time"
  		);
- 	txt = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Version String");
- 	AxWin3_Widget_SetSize(txt, 20);
- 	AxWin3_Widget_SetText(txt, "3.0");
+ 	gTimeDisplay = AxWin3_Widget_AddWidget(ele, ELETYPE_TEXT, ELEFLAG_NOSTRETCH, "Time");
+ 	AxWin3_Widget_SetSize(gTimeDisplay, 20);
+ 	//AxWin3_Widget_SetText(gTimeDisplay, "--:--");
+ 	update_time();
  
  	// Turn off decorations
  	AxWin3_DecorateWindow(gSidebar, 0);
@@@ -109,6 -112,13 +112,13 @@@
  	
  }
  
+ void update_time(void)
+ {
+ 	char	tmpbuf[2+1+2+1] = "--:--";
+ 	//strftime(tmpbuf, sizeof(tmpbuf), "%H:%M", NULL);
+ 	AxWin3_Widget_SetText(gTimeDisplay, tmpbuf);
+ }
+ 
  void mainmenu_app_textedit(void *unused)
  {
  //	_SysDebug("TODO: Launch text editor");
@@@ -147,10 -157,6 +157,10 @@@ int run_dorun(tAxWin3_Widget *unused
  	_SysDebug("DoRun pressed");
  	char *cmd = AxWin3_Widget_GetText(gRunInput);
  	_SysDebug("Command string '%s'", cmd);
 +	
 +	// TODO: Parse the command string into components
 +	// TODO: Call _SysSpawn
 +	
  	AxWin3_ShowWindow(gRunDialog, 0);
  	return 0;
  }