Browse Source

Merge commit 'ec12dc7' into bfgminer

Luke Dashjr 13 years ago
parent
commit
45e7f3a776
2 changed files with 3 additions and 3 deletions
  1. 2 2
      fpgautils.c
  2. 1 1
      miner.php

+ 2 - 2
fpgautils.c

@@ -211,8 +211,8 @@ serial_open(const char*devpath, unsigned long baud, signed short timeout, bool p
 	case 0:
 		break;
 	case 115200:
-		my_termios.c_cflag &= ~CBAUD;
-		my_termios.c_cflag |= B115200;
+		cfsetispeed( &my_termios, B115200 );
+		cfsetospeed( &my_termios, B115200 );
 		break;
 	// TODO: try some higher speeds with the Icarus and BFL to see
 	// if they support them and if setting them makes any difference

+ 1 - 1
miner.php

@@ -166,7 +166,7 @@ function getcss($cssname, $dom = false)
  $css = '';
  foreach ($colourtable as $cssdata => $value)
  {
-	$cssobj = split(' ', $cssdata, 2);
+	$cssobj = explode(' ', $cssdata, 2);
 	if ($cssobj[0] == $cssname)
 	{
 		if (isset($colouroverride[$cssdata]))