hw/pc.c: add ULL suffix in ioport80_read and ioportF0_read return value

[qemu.git] / hw / blizzard_template.h

diff --git a/hw/blizzard_template.h b/hw/blizzard_template.h
index 66aa939fa32806310fd55f8f97723e203d3cc42b..42f4e90b04a2a4daca310b3946abfa28dfc2c98c 100644 (file)
--- a/hw/blizzard_template.h
+++ b/hw/blizzard_template.h
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define SKIP_PIXEL(to)         to += deststep
@@ -43,7 +41,7 @@
 # error unknown bit depth
 #endif
 
-#ifdef WORDS_BIGENDIAN
+#ifdef HOST_WORDS_BIGENDIAN
 # define SWAP_WORDS    1
 #endif
 
@@ -51,11 +49,11 @@ static void glue(blizzard_draw_line16_, DEPTH)(PIXEL_TYPE *dest,
                 const uint16_t *src, unsigned int width)
 {
 #if !defined(SWAP_WORDS) && DEPTH == 16
-    memcpy(dest, src, width << 1);
+    memcpy(dest, src, width);
 #else
     uint16_t data;
     unsigned int r, g, b;
-    const uint16_t *end = (void *) src + width;
+    const uint16_t *end = (const void *) src + width;
     while (src < end) {
         data = lduw_raw(src ++);
         b = (data & 0x1f) << 3;