fixed scaler spelling
This commit is contained in:
@@ -19,13 +19,13 @@ with help from the MiSTer contributors including Grabulosaure
|
||||
|
||||
|
||||
|
||||
#include "scalar.h"
|
||||
#include "scaler.h"
|
||||
|
||||
|
||||
|
||||
mister_scalar * mister_scalar_init()
|
||||
mister_scaler * mister_scaler_init()
|
||||
{
|
||||
mister_scalar *ms =(mister_scalar *) calloc(sizeof(mister_scalar),1);
|
||||
mister_scaler *ms =(mister_scaler *) calloc(sizeof(mister_scaler),1);
|
||||
int pagesize = sysconf(_SC_PAGE_SIZE);
|
||||
if (pagesize==0) pagesize=4096;
|
||||
int offset = MISTER_SCALAR_BASEADDR;
|
||||
@@ -40,7 +40,7 @@ mister_scalar * mister_scalar_init()
|
||||
if (ms->map==MAP_FAILED)
|
||||
{
|
||||
printf("problem MAP_FAILED\n");
|
||||
mister_scalar_free(ms);
|
||||
mister_scaler_free(ms);
|
||||
return NULL;
|
||||
}
|
||||
buffer = (unsigned char *)(ms->map+ms->map_off);
|
||||
@@ -49,7 +49,7 @@ mister_scalar * mister_scalar_init()
|
||||
buffer[8],buffer[9],buffer[10],buffer[11],buffer[12],buffer[13],buffer[14],buffer[15]);
|
||||
if (buffer[0]!=1 || buffer[1]!=1) {
|
||||
printf("problem\n");
|
||||
mister_scalar_free(ms);
|
||||
mister_scaler_free(ms);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -68,14 +68,14 @@ mister_scalar * mister_scalar_init()
|
||||
return ms;
|
||||
|
||||
}
|
||||
void mister_scalar_free(mister_scalar *ms)
|
||||
void mister_scaler_free(mister_scaler *ms)
|
||||
{
|
||||
munmap(ms->map,ms->num_bytes+ms->map_off);
|
||||
close(ms->fd);
|
||||
free(ms);
|
||||
}
|
||||
|
||||
int mister_scalar_read_yuv(mister_scalar *ms,int lineY,unsigned char *bufY, int lineU, unsigned char *bufU, int lineV, unsigned char *bufV) {
|
||||
int mister_scaler_read_yuv(mister_scaler *ms,int lineY,unsigned char *bufY, int lineU, unsigned char *bufU, int lineV, unsigned char *bufV) {
|
||||
unsigned char *buffer;
|
||||
buffer = (unsigned char *)(ms->map+ms->map_off);
|
||||
|
||||
@@ -108,7 +108,7 @@ int mister_scalar_read_yuv(mister_scalar *ms,int lineY,unsigned char *bufY, int
|
||||
|
||||
}
|
||||
|
||||
int mister_scalar_read(mister_scalar *ms,unsigned char *gbuf)
|
||||
int mister_scaler_read(mister_scaler *ms,unsigned char *gbuf)
|
||||
{
|
||||
unsigned char *buffer;
|
||||
buffer = (unsigned char *)(ms->map+ms->map_off);
|
||||
@@ -14,14 +14,14 @@ typedef struct {
|
||||
int num_bytes;
|
||||
int map_off;
|
||||
int fd;
|
||||
} mister_scalar;
|
||||
} mister_scaler;
|
||||
|
||||
|
||||
#define MISTER_SCALAR_BASEADDR 536870912
|
||||
#define MISTER_SCALAR_BUFFERSIZE 2048*3*1024
|
||||
|
||||
|
||||
mister_scalar *mister_scalar_init();
|
||||
int mister_scalar_read(mister_scalar *,unsigned char *buffer);
|
||||
int mister_scalar_read_yuv(mister_scalar *ms,int,unsigned char *y,int, unsigned char *U,int, unsigned char *V);
|
||||
void mister_scalar_free(mister_scalar *);
|
||||
mister_scaler *mister_scaler_init();
|
||||
int mister_scaler_read(mister_scaler *,unsigned char *buffer);
|
||||
int mister_scaler_read_yuv(mister_scaler *ms,int,unsigned char *y,int, unsigned char *U,int, unsigned char *V);
|
||||
void mister_scaler_free(mister_scaler *);
|
||||
10
user_io.cpp
10
user_io.cpp
@@ -28,7 +28,7 @@
|
||||
#include "tzx2wav.h"
|
||||
#include "bootcore.h"
|
||||
#include "charrom.h"
|
||||
#include "scalar.h"
|
||||
#include "scaler.h"
|
||||
|
||||
#include "support.h"
|
||||
|
||||
@@ -2488,14 +2488,14 @@ void user_io_kbd(uint16_t key, int press)
|
||||
if (press==1)
|
||||
{
|
||||
printf("print key pressed - do screen shot\n");
|
||||
mister_scalar *ms=mister_scalar_init();
|
||||
mister_scaler *ms=mister_scaler_init();
|
||||
if (ms==NULL)
|
||||
{
|
||||
printf("problem with scalar, maybe not a new enough version\n");
|
||||
printf("problem with scaler, maybe not a new enough version\n");
|
||||
Info("Scalar not compatible");
|
||||
}
|
||||
unsigned char *outputbuf = (unsigned char *)calloc(ms->width*ms->height*3,1);
|
||||
mister_scalar_read(ms,outputbuf);
|
||||
mister_scaler_read(ms,outputbuf);
|
||||
char path[1024];
|
||||
char filename[1024];
|
||||
//user_io_get_core_name()
|
||||
@@ -2508,7 +2508,7 @@ void user_io_kbd(uint16_t key, int press)
|
||||
Info("error in saving png");
|
||||
}
|
||||
free(outputbuf);
|
||||
mister_scalar_free(ms);
|
||||
mister_scaler_free(ms);
|
||||
char msg[1024];
|
||||
snprintf(msg,1024,"Saving screen shot\n %s\n",filename+strlen("screenshot/"));
|
||||
Info(msg);
|
||||
|
||||
Reference in New Issue
Block a user