xnu-2782.1.97.tar.gz

[apple/xnu.git] / osfmk / console / video_console.h

diff --git a/osfmk/console/video_console.h b/osfmk/console/video_console.h
index 26c6081fc8c149a8186c90a2c12b87d9d48a1b22..5e38a23f076e922927ba86570e9e13625feaa86e 100644 (file)
--- a/osfmk/console/video_console.h
+++ b/osfmk/console/video_console.h
@@ -58,19 +58,19 @@ void video_scroll_down(     void    *start,  /* HIGH addr */
 
 struct vc_info
 {
-    unsigned int       v_height;       /* pixels */
-    unsigned int       v_width;        /* pixels */
-    unsigned int       v_depth;
-    unsigned int       v_rowbytes;
-    unsigned long      v_baseaddr;
-    unsigned int       v_type;
-    char               v_name[32];
-    uint64_t           v_physaddr;
-    unsigned int       v_rows;         /* characters */
-    unsigned int       v_columns;      /* characters */
-    unsigned int       v_rowscanbytes; /* Actualy number of bytes used for display per row*/
-    unsigned int       v_scale;
-    unsigned int       v_reserved[4];
+       unsigned int    v_height;       /* pixels */
+       unsigned int    v_width;        /* pixels */
+       unsigned int    v_depth;
+       unsigned int    v_rowbytes;
+       unsigned long   v_baseaddr;
+       unsigned int    v_type;
+       char            v_name[32];
+       uint64_t        v_physaddr;
+       unsigned int    v_rows;         /* characters */
+       unsigned int    v_columns;      /* characters */
+       unsigned int    v_rowscanbytes; /* Actualy number of bytes used for display per row*/
+       unsigned int    v_scale;        
+       unsigned int    v_reserved[4];
 };
 
 struct vc_progress_element {
@@ -91,6 +91,7 @@ typedef struct vc_progress_element vc_progress_element;
 void vc_progress_initialize( vc_progress_element * desc,
                                     const unsigned char * data1x,
                                     const unsigned char * data2x,
+                                    const unsigned char * data3x,
                                     const unsigned char * clut );
 
 void vc_progress_set(boolean_t enable, uint32_t vc_delay);
@@ -103,14 +104,13 @@ int vc_display_lzss_icon(uint32_t dst_x,       uint32_t dst_y,
                      uint32_t       compressed_size, 
                      const uint8_t *clut);
 
-#if !CONFIG_EMBEDDED
 
 extern void vc_enable_progressmeter(int new_value);
 extern void vc_set_progressmeter(int new_value);
-extern int vc_progress_meter_enable;
-extern int vc_progress_meter_value;
+extern int vc_progressmeter_enable;
+extern int vc_progressmeter_value;
+extern void vc_progress_setdiskspeed(uint32_t speed);
 
-#endif /* !CONFIG_EMBEDDED */
 
 #ifdef __cplusplus
 }