Merge branch 'master' into intel-extreme

headers/os/interface/InterfaceDefs.h

@@ -333,6 +333,8 @@ enum color_which {
 	B_TOOL_TIP_BACKGROUND_COLOR = 20,
 	B_TOOL_TIP_TEXT_COLOR = 21,
 
+	B_STATUS_BAR_COLOR = 37,
+
 	B_SUCCESS_COLOR = 100,
 	B_FAILURE_COLOR = 101,
 

headers/posix/termios.h

@@ -21,8 +21,8 @@ struct termios {
 	tcflag_t	c_cflag;	/* control modes */
 	tcflag_t	c_lflag;	/* local modes */
 	char		c_line;		/* line discipline */
-	speed_t		c_ispeed;	/* (unused) */
-	speed_t		c_ospeed;	/* (unused) */
+	speed_t		c_ispeed;	/* custom input baudrate */
+	speed_t		c_ospeed;	/* custom output baudrate */
 	cc_t		c_cc[NCCS];	/* control characters */
 };
 

headers/private/app/ServerReadOnlyMemory.h

@@ -15,7 +15,7 @@
 
 // Update kColorWhichLastContinuous with the largest color constant which
 // leaves no gaps in the color_which integer values.
-static const int32 kColorWhichLastContinuous = B_LINK_ACTIVE_COLOR;
+static const int32 kColorWhichLastContinuous = B_STATUS_BAR_COLOR;
 static const int32 kColorWhichCount = kColorWhichLastContinuous + 3;
 	// + 1 for index-offset, + 2 for B_SUCCESS_COLOR, B_FAILURE_COLOR
 

headers/private/graphics/via/DriverInterface.h

@@ -97,6 +97,73 @@ typedef struct settings {  // apsed, see comments in skel.settings
 	bool   pgm_panel;
 } settings;
 
+/* card info - information gathered from PINS (and other sources) */
+enum
+{	// card_type in order of date of VIA chip design (fixme: check order)
+	VT3122 = 0,
+	VT3022,
+	VT7205,
+	VT3205,
+	VT3108,
+	VT3204NC,
+	NV04,
+	NV05,
+	NV05M64,
+	NV06,
+	NV10,
+	NV11,
+	NV11M,
+	NV15,
+	NV17,
+	NV17M,
+	NV18,
+	NV18M,
+	NV20,
+	NV25,
+	NV28,
+	NV30,
+	NV31,
+	NV34,
+	NV35,
+	NV36,
+	NV38,
+	NV40,
+	NV41,
+	NV43,
+	NV45
+};
+enum
+{	// card_arch in order of date of VIA chip design
+	CLE266 = 0,
+	KM400,
+	K8M800,
+	NV04A,
+	NV10A,
+	NV20A,
+	NV30A,
+	NV40A
+};
+enum
+{	// tvout_chip_type in order of capability (more or less)
+	NONE = 0,
+	CH7003,
+	CH7004,
+	CH7005,
+	CH7006,
+	CH7007,
+	CH7008,
+	SAA7102,
+	SAA7103,
+	SAA7104,
+	SAA7105,
+	BT868,
+	BT869,
+	CX25870,
+	CX25871,
+	NVIDIA
+};
+
+
 /*shared info*/
 typedef struct {
   /*a few ID things*/
@@ -171,72 +238,6 @@ typedef struct {
 		benaphore	lock;		/* for serializing access to the acceleration engine */
 	} engine;
 
-  /* card info - information gathered from PINS (and other sources) */
-	enum
-	{	// card_type in order of date of VIA chip design (fixme: check order)
-		VT3122 = 0,
-		VT3022,
-		VT7205,
-		VT3205,
-		VT3108,
-		VT3204NC,
-		NV04,
-		NV05,
-		NV05M64,
-		NV06,
-		NV10,
-		NV11,
-		NV11M,
-		NV15,
-		NV17,
-		NV17M,
-		NV18,
-		NV18M,
-		NV20,
-		NV25,
-		NV28,
-		NV30,
-		NV31,
-		NV34,
-		NV35,
-		NV36,
-		NV38,
-		NV40,
-		NV41,
-		NV43,
-		NV45
-	};
-	enum
-	{	// card_arch in order of date of VIA chip design
-		CLE266 = 0,
-		KM400,
-		K8M800,
-		NV04A,
-		NV10A,
-		NV20A,
-		NV30A,
-		NV40A
-	};
-	enum
-	{	// tvout_chip_type in order of capability (more or less)
-		NONE = 0,
-		CH7003,
-		CH7004,
-		CH7005,
-		CH7006,
-		CH7007,
-		CH7008,
-		SAA7102,
-		SAA7103,
-		SAA7104,
-		SAA7105,
-		BT868,
-		BT869,
-		CX25870,
-		CX25871,
-		NVIDIA
-	};
-
 	struct
 	{
 		/* specialised registers for card initialisation read from NV BIOS (pins) */

headers/private/kernel/platform/u-boot/fdt_support.h

@@ -16,7 +16,7 @@ void dump_fdt(const void *fdt);
 status_t fdt_get_cell_count(const void* fdt, int node,
 	int32 &addressCells, int32 &sizeCells);
 
-phys_addr_t fdt_get_device_reg(const void* fdt, int node);
+phys_addr_t fdt_get_device_reg(const void* fdt, int node, bool physical=true);
 phys_addr_t fdt_get_device_reg_byname(const void* fdt, const char* name);
 phys_addr_t fdt_get_device_reg_byalias(const void* fdt, const char* alias);